From f341bb1ae036338c020362fc4266155add4993e3 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 4 Aug 2013 23:30:28 -0400
Subject: [PATCH 01/20] Fix error exporting linked HTML file

https://forums.zotero.org/discussion/29392/#Item_14
---
 chrome/content/zotero/xpcom/translation/translate_item.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/xpcom/translation/translate_item.js b/chrome/content/zotero/xpcom/translation/translate_item.js
index afab5df4d..6778820df 100644
--- a/chrome/content/zotero/xpcom/translation/translate_item.js
+++ b/chrome/content/zotero/xpcom/translation/translate_item.js
@@ -822,9 +822,10 @@ Zotero.Translate.ItemGetter.prototype = {
 						
 						var directory = targetFile.parent;
 						
-						// The only attachments that can have multiple supporting files are of mime type
-						// text/html (specified in Attachments.getNumFiles())
-						if(attachment.attachmentMIMEType == "text/html" 
+						// The only attachments that can have multiple supporting files are imported
+						// attachments of mime type text/html (specified in Attachments.getNumFiles())
+						if(attachment.attachmentMIMEType == "text/html"
+								&& linkMode != Zotero.Attachments.LINK_MODE_LINKED_FILE
 								&& Zotero.Attachments.getNumFiles(attachment) > 1) {
 							// Attachment is a snapshot with supporting files. Check if any of the
 							// supporting files would cause a name conflict, and build a list of transfers

From 86c66115608330aedda34f2a950139ac2a33211c Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 5 Aug 2013 10:57:09 -0400
Subject: [PATCH 02/20] Update auto-update pref text to include styles

---
 chrome/locale/en-US/zotero/preferences.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index 5c4b48f68..813ce1207 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes				"Note font size:">
 
 <!ENTITY zotero.preferences.miscellaneous				"Miscellaneous">
-<!ENTITY zotero.preferences.autoUpdate					"Automatically check for updated translators">
+<!ENTITY zotero.preferences.autoUpdate					"Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow					"Update now">
 <!ENTITY zotero.preferences.reportTranslationFailure		"Report broken site translators">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader			"Allow zotero.org to customize content based on current Zotero version">

From 675fde2f1a894a7e824e19002a4febc439353250 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 5 Aug 2013 16:31:23 -0400
Subject: [PATCH 03/20] Use async I/O for attachment (blue dot) column file
 check in Fx23+

---
 chrome/content/zotero/xpcom/data/item.js    | 78 +++++++++++++++++++--
 chrome/content/zotero/xpcom/itemTreeView.js | 63 +++++++++++------
 2 files changed, 114 insertions(+), 27 deletions(-)

diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index d4531d182..b04c12bcb 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -2951,12 +2951,48 @@ Zotero.Item.prototype.getFilename = function () {
  *
  * This is updated only initially and on subsequent getFile() calls.
  */
-Zotero.Item.prototype.__defineGetter__('fileExists', function () {
-	if (this._fileExists === null) {
+Zotero.Item.prototype.fileExists = function (cachedOnly) {
+	if (!cachedOnly && this._fileExists === null) {
 		this.getFile();
 	}
 	return this._fileExists;
-});
+};
+
+
+/**
+ * Asynchronous cached check for file existence, used for items view
+ *
+ * This is updated only initially and on subsequent getFile() calls.
+ */
+Zotero.Item.prototype.fileExistsAsync = function () {
+	var self = this;
+	return Q.fcall(function () {
+		if (self._fileExists !== null) {
+			return self._fileExists;
+		}
+		
+		if (Zotero.platformMajorVersion < 23) {
+			return self.fileExists();
+		}
+		
+		if (!self.isAttachment()) {
+			throw new Error("Zotero.Item.fileExistsAsync() can only be called on attachment items");
+		}
+		
+		if (self.attachmentLinkMode == Zotero.Attachments.LINK_MODE_LINKED_URL) {
+			throw new Error("Zotero.Item.fileExistsAsync() cannot be called on link attachments");
+		}
+		
+		var nsIFile = self.getFile(null, true);
+		Components.utils.import("resource://gre/modules/osfile.jsm");
+		return Q(OS.File.exists(nsIFile.path))
+		.then(function(exists) {
+			self._updateAttachmentStates(exists);
+			return exists;
+		});
+	});
+};
+
 
 
 /*
@@ -3611,16 +3647,46 @@ Zotero.Item.prototype.getBestAttachment = function() {
  *
  * @return {Integer}  0 (none), 1 (present), -1 (missing)
  */
-Zotero.Item.prototype.getBestAttachmentState = function () {
-	if (this._bestAttachmentState !== null) {
+Zotero.Item.prototype.getBestAttachmentState = function (cachedOnly) {
+	if (cachedOnly || this._bestAttachmentState !== null) {
 		return this._bestAttachmentState;
 	}
 	var itemID = this.getBestAttachment();
-	this._bestAttachmentState = itemID ? (Zotero.Items.get(itemID).fileExists ? 1 : -1) : 0;
+	this._bestAttachmentState = itemID
+		? (Zotero.Items.get(itemID).fileExists() ? 1 : -1)
+		: 0;
 	return this._bestAttachmentState;
 }
 
 
+/**
+ * Return cached state of best attachment for use in items view
+ *
+ * @return {Promise:Integer}  Promise with 0 (none), 1 (present), -1 (missing)
+ */
+Zotero.Item.prototype.getBestAttachmentStateAsync = function () {
+	var self = this;
+	return Q.fcall(function() {
+		if (self._bestAttachmentState !== null) {
+			return self._bestAttachmentState;
+		}
+		var itemID = self.getBestAttachment();
+		if (itemID) {
+			return Zotero.Items.get(itemID).fileExistsAsync()
+			.then(function (exists) {
+				self._bestAttachmentState = exists ? 1 : -1;
+			});
+		}
+		else {
+			self._bestAttachmentState = 0;
+		}
+	})
+	.then(function () {
+		return self._bestAttachmentState;
+	});
+}
+
+
 Zotero.Item.prototype.updateBestAttachmentState = function () {
 	this._bestAttachmentState = null;
 }
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index fde9c11b3..9656ed579 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -598,7 +598,8 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
 			// Clear item type icons
 			var items = Zotero.Items.get(ids);
 			for (let i=0; i<items.length; i++) {
-				delete this._itemImages[items[i].id];
+				let id = items[i].id;
+				delete this._itemImages[id];
 			}
 			
 			this.refresh();
@@ -612,7 +613,7 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
 			var items = Zotero.Items.get(ids);
 			
 			for each(var item in items) {
-				var id = item.id;
+				let id = item.id;
 				
 				// Make sure row map is up to date
 				// if we made changes in a previous loop
@@ -691,8 +692,9 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
 			var isTrash = itemGroup.isTrash();
 			var items = Zotero.Items.get(ids);
 			for each(var item in items) {
+				let id = item.id;
 				// Clear item type icon
-				delete this._itemImages[item.id];
+				delete this._itemImages[id];
 				
 				// If not viewing trash and all items were deleted, ignore modify
 				if (allDeleted && !isTrash && !item.deleted) {
@@ -1062,34 +1064,53 @@ Zotero.ItemTreeView.prototype.getImageSrc = function(row, col)
 		if (this._itemGroup.isTrash()) return false;
 		
 		var treerow = this._getItemAtRow(row);
+		var item = treerow.ref;
 		
 		if ((!this.isContainer(row) || !this.isContainerOpen(row))
-				&& Zotero.Sync.Storage.getItemDownloadImageNumber(treerow.ref)) {
+				&& Zotero.Sync.Storage.getItemDownloadImageNumber(item)) {
 			return '';
 		}
 		
+		var itemID = item.id;
+		
 		if (treerow.level === 0) {
-			if (treerow.ref.isRegularItem()) {
-				switch (treerow.ref.getBestAttachmentState()) {
-					case 1:
-						return "chrome://zotero/skin/bullet_blue.png";
-					
-					case -1:
-						return "chrome://zotero/skin/bullet_blue_empty.png";
-					
-					default:
-						return "";
+			if (item.isRegularItem()) {
+				let state = item.getBestAttachmentState(true);
+				if (state !== null) {
+					switch (state) {
+						case 1:
+							return "chrome://zotero/skin/bullet_blue.png";
+						
+						case -1:
+							return "chrome://zotero/skin/bullet_blue_empty.png";
+						
+						default:
+							return "";
+					}
 				}
+				
+				item.getBestAttachmentStateAsync()
+				// Refresh cell when promise is fulfilled
+				.then(function (state) {
+					this._treebox.invalidateCell(row, col);
+				}.bind(this))
+				.done();
 			}
 		}
 		
-		if (treerow.ref.isFileAttachment()) {
-			if (treerow.ref.fileExists) {
-				return "chrome://zotero/skin/bullet_blue.png";
-			}
-			else {
-				return "chrome://zotero/skin/bullet_blue_empty.png";
+		if (item.isFileAttachment()) {
+			let exists = item.fileExists(true);
+			if (exists !== null) {
+				return exists
+					? "chrome://zotero/skin/bullet_blue.png"
+					: "chrome://zotero/skin/bullet_blue_empty.png";
 			}
+			
+			item.fileExistsAsync()
+			// Refresh cell when promise is fulfilled
+			.then(function (exists) {
+				this._treebox.invalidateCell(row, col);
+			}.bind(this));
 		}
 	}
 }
@@ -1354,7 +1375,7 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 		case 'hasAttachment':
 			getField = function (row) {
 				if (row.ref.isAttachment()) {
-					var state = row.ref.fileExists ? 1 : -1;
+					var state = row.ref.fileExists() ? 1 : -1;
 				}
 				else if (row.ref.isRegularItem()) {
 					var state = row.ref.getBestAttachmentState();

From 97f662fe6720635e62fce0322091656f64bbedfe Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 5 Aug 2013 20:47:50 -0400
Subject: [PATCH 04/20] Fix note resetting in external note window during file
 syncing

https://forums.zotero.org/discussion/29008
---
 chrome/content/zotero/note.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/chrome/content/zotero/note.js b/chrome/content/zotero/note.js
index b3972aa83..c4cb38ecc 100644
--- a/chrome/content/zotero/note.js
+++ b/chrome/content/zotero/note.js
@@ -88,8 +88,7 @@ function onUnload()
 
 var NotifyCallback = {
 	notify: function(action, type, ids){
-		// DEBUG: why does this reset without checking the modified ids?
-		if (noteEditor.item) {
+		if (noteEditor.item && ids.indexOf(noteEditor.item.id) != -1) {
 			noteEditor.item = noteEditor.item;
 			
 			// If the document title hasn't yet been set, reset undo so

From f2d9580ba63d9a7eb6249df6e5b7c18d63f2c31d Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 6 Aug 2013 15:19:45 -0400
Subject: [PATCH 05/20] Update locales from Transifex

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

diff --git a/chrome/locale/af-ZA/zotero/preferences.dtd b/chrome/locale/af-ZA/zotero/preferences.dtd
index df053f1c6..cde46a89f 100644
--- a/chrome/locale/af-ZA/zotero/preferences.dtd
+++ b/chrome/locale/af-ZA/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Note font size:">
 
 <!ENTITY zotero.preferences.miscellaneous "Diverse">
-<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Werk nóú by">
 <!ENTITY zotero.preferences.reportTranslationFailure "Rapporteer gebroke werfvertalers">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Allow zotero.org to customize content based on current Zotero version">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Snelsleutels">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/sluit Zotero-paneel">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Verwissel volskermmodus">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Kitssoektog">
-<!ENTITY zotero.preferences.keys.newItem "Skep nuwe item">
-<!ENTITY zotero.preferences.keys.newNote "Skep 'n nuwe nota">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Swik merkerselektor">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copy Selected Item Citations to Clipboard">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopieer geselekteerde items na knipbord">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Probeer konflikterende snelsleutels oorheers">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Veranderinge vind net in nuwe vensters plaas">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties
index e88d80c55..6ed16aa96 100644
--- a/chrome/locale/af-ZA/zotero/zotero.properties
+++ b/chrome/locale/af-ZA/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/ar/zotero/preferences.dtd b/chrome/locale/ar/zotero/preferences.dtd
index e4522b0df..ea49268ab 100644
--- a/chrome/locale/ar/zotero/preferences.dtd
+++ b/chrome/locale/ar/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "حجم خط الملاحظات:">
 
 <!ENTITY zotero.preferences.miscellaneous "أخرى">
-<!ENTITY zotero.preferences.autoUpdate "التأكد التلقائي من وجود مترجمات مواقع محدثة">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "التحديث الآن">
 <!ENTITY zotero.preferences.reportTranslationFailure "الإبلاغ عن مترجمات مواقع معطلة">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "السماح لموقع زوتيرو بتخصيص المحتوى بناء على الاصدار الحالي لزوتيرو">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "اختصارات">
 
 <!ENTITY zotero.preferences.keys.openZotero "فتح/إغلاق نافذة زوتيرو">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "التنشيط لوضع ملء الشاشة">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "البحث السريع">
-<!ENTITY zotero.preferences.keys.newItem "انشئ عنصر جديد">
-<!ENTITY zotero.preferences.keys.newNote "انشئ ملاحظة جديدة">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "تنشيط محدد الأوسمة">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "نسخ استشهادات العنصر المختار للحافظة">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "انسخ العناصر المحددة للحافظة">
 <!ENTITY zotero.preferences.keys.importFromClipboard "الاستيراد من الحافظة">
-<!ENTITY zotero.preferences.keys.overrideGlobal "حاول تجنب الإختصارات المتعارضة">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "يتم تفعيل التغييرات في النوافذ الجديدة فقط">
 
 <!ENTITY zotero.preferences.prefpane.proxies "الوكيل">
diff --git a/chrome/locale/ar/zotero/standalone.dtd b/chrome/locale/ar/zotero/standalone.dtd
index 8afc80f84..9f178c90d 100644
--- a/chrome/locale/ar/zotero/standalone.dtd
+++ b/chrome/locale/ar/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "تحديد الكل">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "ح">
-<!ENTITY preferencesCmd.label "خيارات…">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "ي">
 <!ENTITY preferencesCmdUnix.label "تفضيلات">
 <!ENTITY preferencesCmdUnix.accesskey "ف">
diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties
index ba3f0f55a..7bd39ebab 100644
--- a/chrome/locale/ar/zotero/zotero.properties
+++ b/chrome/locale/ar/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=إدارة محرك البحث...
 standalone.corruptInstallation=يبدو أن تثبيت Zotero المستقل قد تلف بسبب تحديث التلقائي فاشل. قد يستمر Zotero في العمل، لتجنب الأخطاء المحتملة، يرجى تحميل أحدث نسخة من Zotero مستقل من http://zotero.org/support/standalone في أقرب وقت ممكن.
 standalone.addonInstallationFailed.title=فشلت عملية تنصيب الوظيفة الاضافية
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=خطأ في موصل الزوتيرو
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/bg-BG/zotero/preferences.dtd b/chrome/locale/bg-BG/zotero/preferences.dtd
index cf4e32814..15eab3aaf 100644
--- a/chrome/locale/bg-BG/zotero/preferences.dtd
+++ b/chrome/locale/bg-BG/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Размер на шрифта в бележките:">
 
 <!ENTITY zotero.preferences.miscellaneous "Разни">
-<!ENTITY zotero.preferences.autoUpdate "Автоматична проверка за усъвременени преводачи">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Oсъвременява веднага">
 <!ENTITY zotero.preferences.reportTranslationFailure "Осведомява за неработещи преводачи на страници">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Разрешава на zotero.org да персонализира съдържанието според настоящата версия на Зотеро">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Клавишни Комбинации">
 
 <!ENTITY zotero.preferences.keys.openZotero "Отваря/Затваря на Панела на Зотеро">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Превключва в Режим на Цял Екран">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Бързо Търсене">
-<!ENTITY zotero.preferences.keys.newItem "Създаване на нов запис">
-<!ENTITY zotero.preferences.keys.newNote "Създаване на нова бележка">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Превключване на Избора на Отметки">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Копирани на цитати за избраните записите в клипборда">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Копиране на избраните записи в клипборда">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Внос от Клипборда">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Приоритет в случай на конфликт в клавишните комбинации.">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Промените ще се отразят само в новите прозорци">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Проксита">
diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties
index 883478de2..683552bf2 100644
--- a/chrome/locale/bg-BG/zotero/zotero.properties
+++ b/chrome/locale/bg-BG/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/ca-AD/zotero/preferences.dtd b/chrome/locale/ca-AD/zotero/preferences.dtd
index 7121bde3d..57b65c9ef 100644
--- a/chrome/locale/ca-AD/zotero/preferences.dtd
+++ b/chrome/locale/ca-AD/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Mida de lletra de la nota:">
 
 <!ENTITY zotero.preferences.miscellaneous "Miscel·lània">
-<!ENTITY zotero.preferences.autoUpdate "Cerca automàticament actualitzacions dels transcriptors">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Actualitza ara">
 <!ENTITY zotero.preferences.reportTranslationFailure "Envia un informe dels transcriptors trencats">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Permeteu que zotero.org personalitzi el contingut en base a la versió actual del Zotero">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Dreceres de teclat">
 
 <!ENTITY zotero.preferences.keys.openZotero "Obre/Tanca el Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Canvia a pantalla completa">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Enfoca la subfinestra de les biblioteques">
 <!ENTITY zotero.preferences.keys.quicksearch "Cerca ràpida">
-<!ENTITY zotero.preferences.keys.newItem "Crea un element nou">
-<!ENTITY zotero.preferences.keys.newNote "Crea una nova nota">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Canvia el selector d&apos;etiquetes">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copia les cites dels elements seleccionats al porta-retalls">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copia els elements seleccionats al porta-retalls">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importa des del porta-retalls">
-<!ENTITY zotero.preferences.keys.overrideGlobal "intenta corregir els conflictes en les dreceres de teclat">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Els canvis tenen efecte només en les finestres noves">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Servidors intermediaris">
diff --git a/chrome/locale/ca-AD/zotero/standalone.dtd b/chrome/locale/ca-AD/zotero/standalone.dtd
index 606823133..e8b2e079e 100644
--- a/chrome/locale/ca-AD/zotero/standalone.dtd
+++ b/chrome/locale/ca-AD/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Selecciona-ho tot">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opcions...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Preferències...">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties
index ad6370ec3..a6371f771 100644
--- a/chrome/locale/ca-AD/zotero/zotero.properties
+++ b/chrome/locale/ca-AD/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=La teva instal·lació de Zotero Independent sembla estar danyada a causa d'un error d'actualització automàtica. Mentre que Zotero pot seguir funcionant, per evitar possibles errors, si us plau descarrega la darrera versió de Zotero Independent de http://zotero.org/support/standalone tan aviat com sigui possible.
 standalone.addonInstallationFailed.title=La intal·lació del complement ha fallat
 standalone.addonInstallationFailed.body=No s'ha pogut instal·lar el complement "%S". Potser és incompatible amb aquesta versió de Zotero Independent.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Error del connector de Zotero
 connector.standaloneOpen=No es pot accedir a la base de dades perquè el Zotero Independent està obert. Visualitzeu el elements al Zotero Independent.
diff --git a/chrome/locale/cs-CZ/zotero/preferences.dtd b/chrome/locale/cs-CZ/zotero/preferences.dtd
index 0da10e65f..bf27645e1 100644
--- a/chrome/locale/cs-CZ/zotero/preferences.dtd
+++ b/chrome/locale/cs-CZ/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Velikost písma poznámek:">
 
 <!ENTITY zotero.preferences.miscellaneous "Různé">
-<!ENTITY zotero.preferences.autoUpdate "Automaticky kontrolovat aktualizace překladačů">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Aktualizovat nyní">
 <!ENTITY zotero.preferences.reportTranslationFailure "Oznamovat poškozené překladače">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Umožnit, aby zotero.org upravovalo obsah na základě aktuální verze Zotera.">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Klávesové zkratky">
 
 <!ENTITY zotero.preferences.keys.openZotero "Otevřít/Zavřít Zotero panel">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Zapnutí celoobrazového módu">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Přejít do panelu Knihovny">
 <!ENTITY zotero.preferences.keys.quicksearch "Rychlé hledání">
-<!ENTITY zotero.preferences.keys.newItem "Vytvořit novou položku">
-<!ENTITY zotero.preferences.keys.newNote "Vytvořit novou poznámku">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Zapnout Výběr štítků">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopírovat citaci vybrané položky do schránky">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopírovat vybrané položky do schránky">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importovat ze schránky">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Pokusit se přepsat zabrané (např. jinými doplňky) klávesové zkratky">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Změny se projeví jen v nových oknech">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxy servery">
diff --git a/chrome/locale/cs-CZ/zotero/standalone.dtd b/chrome/locale/cs-CZ/zotero/standalone.dtd
index f8ee19be5..0bfaca692 100644
--- a/chrome/locale/cs-CZ/zotero/standalone.dtd
+++ b/chrome/locale/cs-CZ/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Vybrat vše">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Možnosti...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Nastavení">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties
index c24c1963c..9198d6e6a 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.properties
+++ b/chrome/locale/cs-CZ/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Instalace vašeho Samostatného Zotera se zdá být poškozena kvůli nezdařené automatické aktualizaci. Zotero může dál fungovat, nicméně pokud se chcete vyhnout potenciálním chybám, doporučujeme co nejdříve znovu stáhnout Samostatné Zotero z http://zotero.org/support/standalone.
 standalone.addonInstallationFailed.title=Instalace doplňku selhala.
 standalone.addonInstallationFailed.body=Doplněk "%S"  nemohl být nainstalován. Může být nekompatibilní s touto verzí Samostantého Zotera.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Chyba připojení Zotera.
 connector.standaloneOpen=Není možné přistupovat k vaší databázi, protože je otevřeno Samostatné Zotero. K prohlížení vašich položek použijte prosím Samostatné Zotero.
diff --git a/chrome/locale/da-DK/zotero/about.dtd b/chrome/locale/da-DK/zotero/about.dtd
index 475029cf0..6d361edfa 100644
--- a/chrome/locale/da-DK/zotero/about.dtd
+++ b/chrome/locale/da-DK/zotero/about.dtd
@@ -10,4 +10,4 @@
 <!ENTITY zotero.thanks "Særlig tak til:">
 <!ENTITY zotero.about.close "Luk">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Flere anerkendelser">
-<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
+<!ENTITY zotero.citationProcessing "Arbejde med reference og litteraturliste ">
diff --git a/chrome/locale/da-DK/zotero/preferences.dtd b/chrome/locale/da-DK/zotero/preferences.dtd
index 2d982a425..eba4de9a6 100644
--- a/chrome/locale/da-DK/zotero/preferences.dtd
+++ b/chrome/locale/da-DK/zotero/preferences.dtd
@@ -3,7 +3,7 @@
 <!ENTITY zotero.preferences.default "Default:">
 <!ENTITY zotero.preferences.items "Elementer">
 <!ENTITY zotero.preferences.period ".">
-<!ENTITY zotero.preferences.settings "Settings">
+<!ENTITY zotero.preferences.settings "Indstillinger">
 
 <!ENTITY zotero.preferences.prefpane.general "Generelt">
 
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Skriftstørrelse i noter:">
 
 <!ENTITY zotero.preferences.miscellaneous "Forskelligt">
-<!ENTITY zotero.preferences.autoUpdate "Se automatisk efter opdatering af &quot;oversættere&quot;">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Opdater nu">
 <!ENTITY zotero.preferences.reportTranslationFailure "Rapporter om &quot;oversættere&quot; uden forbindelse">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Tillad Zoter.org at tilpasse indhold baseret på den aktuelle Zotero-version">
@@ -39,7 +39,7 @@
 <!ENTITY zotero.preferences.groups.childNotes "underliggende Noter">
 <!ENTITY zotero.preferences.groups.childFiles "underliggende &quot;Snapshots&quot; og importerede filer">
 <!ENTITY zotero.preferences.groups.childLinks "underliggende links">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "etiketter">
 
 <!ENTITY zotero.preferences.openurl.caption "OpenURL">
 
@@ -60,14 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Synkroniser Vedhæftninger i Mit Bibliotek ved hjælp af">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Synkroniser Vedhæftninger i gruppe-biblioteker ved hjælp af Zoteros online-lager">
-<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
-<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
-<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Hent filer">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "under synkronisering">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "efter behov">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Når du anvender Zoteros online-lager, er du forpligtet på dets">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "betingelser">
-<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
-<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
-<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
+<!ENTITY zotero.preferences.sync.reset.warning1 "Følgende operationer er bruges normalt kun i sjældne og meget specielle situationer og bør ikke bruges ved normal problemløsning. I mange tilfælde vil nulstilling føre til yderligere problemer. Se">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Synkroniser nulstillingsindstillinger">
+<!ENTITY zotero.preferences.sync.reset.warning3 "for mere information">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Fuld synkronisering med Zotero Server">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Flet de lokale Zotero-data med data fra synkroniserings-serveren uanset deres synkroniserings-historik.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Gendan fra Zotero Server">
@@ -76,7 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Slet alle server-data og overskriv med lokale data fra Zotero.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Nulstil historik for fil-synkronisering">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Gennemtving et tjek af lager-serveren for alle lokale Vedhæftninger">
-<!ENTITY zotero.preferences.sync.reset "Reset">
+<!ENTITY zotero.preferences.sync.reset "Nulstil">
 <!ENTITY zotero.preferences.sync.reset.button "Nulstil...">
 
 
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Genvejs-taster">
 
 <!ENTITY zotero.preferences.keys.openZotero "Åbn/Luk Zotero-vinduet">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Slå fuldskærmsvisning til/fra">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "Panel med fokusbiblioteker">
 <!ENTITY zotero.preferences.keys.quicksearch "Hurtigsøgning">
-<!ENTITY zotero.preferences.keys.newItem "Opret nyt Element">
-<!ENTITY zotero.preferences.keys.newNote "Opret ny Note">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Slå Tag selector til/fra">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopier valgte henvisninger til udklipsholder">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopier valgte Elementer til udklipsholder">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importer fra udklipsholder">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Forsøg at løse overlappende genveje">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Ændringer vil kun træde i kraft i nyåbnede vinduer">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxyer">
@@ -161,7 +161,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Enhver tegnstreng">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avanceret">
-<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Filer og mapper">
 
 <!ENTITY zotero.preferences.prefpane.locate "Lokaliser">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Håndtering af søgemaskiner for artikler">
@@ -181,11 +181,11 @@
 <!ENTITY zotero.preferences.dataDir.choose "Vælg...">
 <!ENTITY zotero.preferences.dataDir.reveal "Vis data-mappen">
 
-<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
-<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
-<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
-<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
-<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Tilknyttet databasefolder for vedhæftninger">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero vil benytte relative stier for tilknyttede vedhæftede filer i databasefolderen, hvilket giver dig mulighed for at tilgå filerne med forskellige computere så længe filstrukturen i databasefolderen forbliver den samme">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Databasefolder:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Vælg...">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Gendan til absolutte stier...">
 
 <!ENTITY zotero.preferences.dbMaintenance "Vedligeholdelse af databasen">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Tjek databasens gyldighed">
@@ -204,4 +204,4 @@
 <!ENTITY zotero.preferences.openAboutConfig "Åbn about:config">
 <!ENTITY zotero.preferences.openCSLEdit "Åbn CSL-Editor">
 <!ENTITY zotero.preferences.openCSLPreview "Åbn CSL-Preview">
-<!ENTITY zotero.preferences.openAboutMemory "Open about:memory">
+<!ENTITY zotero.preferences.openAboutMemory "Åben about:memory">
diff --git a/chrome/locale/da-DK/zotero/standalone.dtd b/chrome/locale/da-DK/zotero/standalone.dtd
index 1b5cd7fec..3992fff19 100644
--- a/chrome/locale/da-DK/zotero/standalone.dtd
+++ b/chrome/locale/da-DK/zotero/standalone.dtd
@@ -12,12 +12,12 @@
 
 <!ENTITY fileMenu.label "Fil">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "Gem...">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
+<!ENTITY pageSetupCmd.label "Sideopsætning...">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "Udskriv…">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Luk">
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Vælg alle">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opsætning">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Indstillinger">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/da-DK/zotero/zotero.dtd b/chrome/locale/da-DK/zotero/zotero.dtd
index 353311428..99d6450db 100644
--- a/chrome/locale/da-DK/zotero/zotero.dtd
+++ b/chrome/locale/da-DK/zotero/zotero.dtd
@@ -5,7 +5,7 @@
 <!ENTITY zotero.general.edit "Rediger">
 <!ENTITY zotero.general.delete "Slet">
 
-<!ENTITY zotero.errorReport.title "Zotero Error Report">
+<!ENTITY zotero.errorReport.title "Zotero fejlrapport">
 <!ENTITY zotero.errorReport.unrelatedMessages "Logfilen for fejl kan indeholde meddelelser der ikke har med Zotero at gøre.">
 <!ENTITY zotero.errorReport.submissionInProgress "Vent venligst mens fejlrapporten registreres.">
 <!ENTITY zotero.errorReport.submitted "Din fejlrapport er registreret.">
@@ -13,7 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Læg venligst en besked på Zoteros fora (forums.zotero.org) med dette Rapport-ID, en beskrivelse af problemet og det der får problemet til at opstå.">
 <!ENTITY zotero.errorReport.notReviewed "Fejlrapporter bliver ikke læst medmindre der henvises til dem i Zoteros fora.">
 
-<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
+<!ENTITY zotero.upgrade.title "Zotero opgraderingsguide">
 <!ENTITY zotero.upgrade.newVersionInstalled "Du har installeret en ny version af Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Din Zotero-database skal opgraderes for at virke med den seneste version.">
 <!ENTITY zotero.upgrade.autoBackup "Din nuværende database vil blive sikkerhedskopieret, inden der foretages ændringer.">
@@ -58,22 +58,22 @@
 <!ENTITY zotero.items.rights_column "Rettigheder">
 <!ENTITY zotero.items.dateAdded_column "Tilføjet den">
 <!ENTITY zotero.items.dateModified_column "Ændret den">
-<!ENTITY zotero.items.extra_column "Extra">
-<!ENTITY zotero.items.archive_column "Archive">
-<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
-<!ENTITY zotero.items.place_column "Place">
-<!ENTITY zotero.items.volume_column "Volume">
-<!ENTITY zotero.items.edition_column "Edition">
-<!ENTITY zotero.items.pages_column "Pages">
-<!ENTITY zotero.items.issue_column "Issue">
-<!ENTITY zotero.items.series_column "Series">
-<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.extra_column "Ekstra">
+<!ENTITY zotero.items.archive_column "Arkiv">
+<!ENTITY zotero.items.archiveLocation_column "Loc. i arkiv">
+<!ENTITY zotero.items.place_column "Sted">
+<!ENTITY zotero.items.volume_column "Omfang">
+<!ENTITY zotero.items.edition_column "Udgave">
+<!ENTITY zotero.items.pages_column "Sider">
+<!ENTITY zotero.items.issue_column "Udgivelse">
+<!ENTITY zotero.items.series_column "Serier">
+<!ENTITY zotero.items.seriesTitle_column "Serie titel">
 <!ENTITY zotero.items.court_column "Court">
 <!ENTITY zotero.items.medium_column "Medium/Format">
 <!ENTITY zotero.items.genre_column "Genre">
 <!ENTITY zotero.items.system_column "System">
-<!ENTITY zotero.items.moreColumns.label "More Columns">
-<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
+<!ENTITY zotero.items.moreColumns.label "Flere kolonner">
+<!ENTITY zotero.items.restoreColumnOrder.label "Genskab kolonneorden">
 
 <!ENTITY zotero.items.menu.showInLibrary "Vis i bibliotek">
 <!ENTITY zotero.items.menu.attach.note "Tilføj note">
@@ -86,10 +86,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Genindlæs i bibliotek">
 <!ENTITY zotero.items.menu.duplicateItem "Duplikér valgte element">
-<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+<!ENTITY zotero.items.menu.mergeItems "Flet elementer...">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
-<!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "Vælg den version af elementet som du vil bruge som hovedelement:">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "Vælg felter som skal afskæres fra andre versioner af elementet:">
 
 <!ENTITY zotero.toolbar.newItem.label "Nyt element">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Mere">
@@ -121,7 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transformer tekst">
 <!ENTITY zotero.item.textTransform.titlecase "Betydende ord med stort ">
 <!ENTITY zotero.item.textTransform.sentencecase "Første bogstav med stort">
-<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Byt rundt på fornavn og efternavn">
 
 <!ENTITY zotero.toolbar.newNote "Ny note">
 <!ENTITY zotero.toolbar.note.standalone "Ny selvstændig note">
@@ -139,18 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Vælg de synlige">
 <!ENTITY zotero.tagSelector.clearVisible "Fravælg de synlige">
 <!ENTITY zotero.tagSelector.clearAll "Fravælg alle">
-<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
+<!ENTITY zotero.tagSelector.assignColor "Tilknyt farve...">
 <!ENTITY zotero.tagSelector.renameTag "Omdøb mærkaten...">
 <!ENTITY zotero.tagSelector.deleteTag "Slet mærkaten...">
 
-<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
-<!ENTITY zotero.tagColorChooser.color "Color:">
-<!ENTITY zotero.tagColorChooser.position "Position:">
-<!ENTITY zotero.tagColorChooser.setColor "Set Color">
-<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+<!ENTITY zotero.tagColorChooser.title "Vælg en farve og placering">
+<!ENTITY zotero.tagColorChooser.color "Farve:">
+<!ENTITY zotero.tagColorChooser.position "Placering:">
+<!ENTITY zotero.tagColorChooser.setColor "Sæt farve:">
+<!ENTITY zotero.tagColorChooser.removeColor "Fjern farve">
 
 <!ENTITY zotero.lookup.description "Indtast ISBN, DOI eller PMID for opslag nedenfor.">
-<!ENTITY zotero.lookup.button.search "Search">
+<!ENTITY zotero.lookup.button.search "Søg">
 
 <!ENTITY zotero.selectitems.title "Vælg elementer">
 <!ENTITY zotero.selectitems.intro.label "Vælg de elementer, du ønsker at tilføje til dit bibliotek">
@@ -159,9 +159,9 @@
 
 <!ENTITY zotero.bibliography.title "Opret bibliografien">
 <!ENTITY zotero.bibliography.style.label "Reference-stil:">
-<!ENTITY zotero.bibliography.outputMode "Output Mode:">
-<!ENTITY zotero.bibliography.bibliography "Bibliography">
-<!ENTITY zotero.bibliography.outputMethod "Output Method:">
+<!ENTITY zotero.bibliography.outputMode "Outputtilstand:">
+<!ENTITY zotero.bibliography.bibliography "Litteraturliste">
+<!ENTITY zotero.bibliography.outputMethod "Outputmetode:">
 <!ENTITY zotero.bibliography.saveAsRTF.label "Gem som RTF">
 <!ENTITY zotero.bibliography.saveAsHTML.label "Gem som HTML">
 <!ENTITY zotero.bibliography.copyToClipboard.label "Kopier til udklipsholder">
@@ -170,7 +170,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Dokumentindstillinger">
 <!ENTITY zotero.integration.addEditCitation.title "Tilføj/rediger reference">
 <!ENTITY zotero.integration.editBibliography.title "Rediger referenceliste">
-<!ENTITY zotero.integration.quickFormatDialog.title "Quick Format Citation">
+<!ENTITY zotero.integration.quickFormatDialog.title "Hurtigformater referencer">
 
 <!ENTITY zotero.progress.title "Fremgang">
 
@@ -189,7 +189,7 @@
 <!ENTITY zotero.citation.suppressAuthor.label "Undertryk forfatter/ophav">
 <!ENTITY zotero.citation.prefix.label "Præfiks:">
 <!ENTITY zotero.citation.suffix.label "Suffiks:">
-<!ENTITY zotero.citation.editorWarning.label "Warning: If you edit a citation in the editor it will no longer update to reflect changes in your database or the citation style.">
+<!ENTITY zotero.citation.editorWarning.label "Advarsel: hvis du redigerer referencer i editoren vil det ikke længere opdatere for at reflektere ændringer i din database eller reference-typografi.">
 
 <!ENTITY zotero.richText.italic.label "Kursiv">
 <!ENTITY zotero.richText.bold.label "Fed">
@@ -212,8 +212,8 @@
 <!ENTITY zotero.integration.prefs.bookmarks.caption "Bogmærker bevares i både Microsoft Word og OpenOffice/LibreOffive, men kan blive ændret ved en fejl. Når denne mulighed er valgt, kan referencer ikke indsættes i fodnoter eller slutnoter.">
 
 
-<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles">
-<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored.">
+<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Afkort automatisk journaltitler">
+<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal-forkortelser vil automatisk blive genereret ved hjælp af journaltitler. Feltet &quot;Journal Abbr&quot; vil blive ignoreret.">
 
 <!ENTITY zotero.integration.prefs.storeReferences.label "Gem referencer i dokument">
 <!ENTITY zotero.integration.prefs.storeReferences.caption "At gemme referencer i dit dokument gør filen en anelse større, men det gør det også muligt at dele dokumentet med andre ved hjælp af en Zotero-gruppe. At opdatere dokumenter oprettet med denne funktion kræver Zotero 3.0 eller højere.">
@@ -239,9 +239,9 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Mærkater, der ikke er markeret, vil ikke blive gemt.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Mærkatet vil blive fjernet fra alle elementer.">
 
-<!ENTITY zotero.merge.title "Conflict Resolution">
-<!ENTITY zotero.merge.of "of">
-<!ENTITY zotero.merge.deleted "Deleted">
+<!ENTITY zotero.merge.title "Reparer konflikter">
+<!ENTITY zotero.merge.of "af">
+<!ENTITY zotero.merge.deleted "Slettede">
 
 <!ENTITY zotero.proxy.recognized.title "Proxy registreret">
 <!ENTITY zotero.proxy.recognized.warning "Tilføj kun proxyer, der er knyttet til dit biblioteks, din institutions eller din virksomheds web-sted">
diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties
index 0b8342275..7c85392eb 100644
--- a/chrome/locale/da-DK/zotero/zotero.properties
+++ b/chrome/locale/da-DK/zotero/zotero.properties
@@ -276,7 +276,7 @@ noteEditor.editNote=Rediger Note
 itemTypes.note=Note
 itemTypes.attachment=Vedhæftning
 itemTypes.book=Bog
-itemTypes.bookSection=Bidrag til bog
+itemTypes.bookSection=Uddrag af bog
 itemTypes.journalArticle=Tidsskriftsartikel
 itemTypes.magazineArticle=Artikel i blad
 itemTypes.newspaperArticle=Avisartikel
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Håndter Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/de/zotero/preferences.dtd b/chrome/locale/de/zotero/preferences.dtd
index b50aa4596..63ca521ad 100644
--- a/chrome/locale/de/zotero/preferences.dtd
+++ b/chrome/locale/de/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Schriftgröße Notizen:">
 
 <!ENTITY zotero.preferences.miscellaneous "Verschiedenes">
-<!ENTITY zotero.preferences.autoUpdate "Automatisch nach neuen Übersetzern suchen">
+<!ENTITY zotero.preferences.autoUpdate "Automatisch auf Übersetzer- und Style-Updates überprüfen">
 <!ENTITY zotero.preferences.updateNow "Jetzt aktualisieren">
 <!ENTITY zotero.preferences.reportTranslationFailure "Fehlerhafte Übersetzer melden">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Zotero.org erlauben, Inhalte auf Basis der aktuellen Zotero-Version anzupassen">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Tastenkombinationen">
 
 <!ENTITY zotero.preferences.keys.openZotero "Zotero-Panel öffnen/schließen">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Vollbild-Modus an/aus">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Fokus auf Bibliotheksspalte">
 <!ENTITY zotero.preferences.keys.quicksearch "Schnellsuche">
-<!ENTITY zotero.preferences.keys.newItem "Neuen Eintrag erstellen">
-<!ENTITY zotero.preferences.keys.newNote "Neue Notiz erstellen">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Tag-Selector an/aus">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Ausgewählte Eintragszitationen in die Zwischenablage kopieren">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Ausgewählte Einträge in die Zwischenablage kopieren">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Import aus der Zwischenablage">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Versuche, konfligierende Tastenkombinationen zu überschreiben">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Änderungen werden nur in neuen Fenstern wirksam">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/de/zotero/standalone.dtd b/chrome/locale/de/zotero/standalone.dtd
index 136775d24..53e11cdf7 100644
--- a/chrome/locale/de/zotero/standalone.dtd
+++ b/chrome/locale/de/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Alle auswählen">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "u">
-<!ENTITY preferencesCmd.label "Optionen...">
+<!ENTITY preferencesCmd.label "Einstellungen">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Einstellungen">
 <!ENTITY preferencesCmdUnix.accesskey "E">
diff --git a/chrome/locale/de/zotero/zotero.properties b/chrome/locale/de/zotero/zotero.properties
index 4f1588d3f..acb10ccbf 100644
--- a/chrome/locale/de/zotero/zotero.properties
+++ b/chrome/locale/de/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Lookup-Engines einrichten...
 standalone.corruptInstallation=Ihre Installation von Zotero Standalone scheint aufgrund eines fehlgeschlagenen automatischen Updates beschädigt worden zu sein. Zotero funktioniert eventuell weiterhin, aber Sie sollten die aktuellste Version von Zotero Standalone von http://zotero.org/support/standalone so bald wie möglich herunterladen, um potentielle Probleme zu vermeiden.
 standalone.addonInstallationFailed.title=Installation der Erweiterung fehlgeschlagen
 standalone.addonInstallationFailed.body=Die Erweiterung "%S" konnte nicht installiert werden. Sie ist eventuell inkompatibel mit dieser Version von Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero-Connector-Fehler
 connector.standaloneOpen=Zugriff auf Ihre Datenbank nicht möglich, da Zotero Standalone im Moment läuft. Bitte betrachten Sie Ihre Einträge in Zotero Standalone.
diff --git a/chrome/locale/el-GR/zotero/preferences.dtd b/chrome/locale/el-GR/zotero/preferences.dtd
index 46834b1b0..3dd89d77b 100644
--- a/chrome/locale/el-GR/zotero/preferences.dtd
+++ b/chrome/locale/el-GR/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Note font size:">
 
 <!ENTITY zotero.preferences.miscellaneous "Miscellaneous">
-<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Update now">
 <!ENTITY zotero.preferences.reportTranslationFailure "Report broken site translators">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Allow zotero.org to customize content based on current Zotero version">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Toggle Fullscreen Mode">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Quick Search">
-<!ENTITY zotero.preferences.keys.newItem "Create a new item">
-<!ENTITY zotero.preferences.keys.newNote "Create a new note">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Toggle Tag Selector">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copy Selected Item Citations to Clipboard">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copy Selected Items to Clipboard">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Changes take effect in new windows only">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties
index e88d80c55..6ed16aa96 100644
--- a/chrome/locale/el-GR/zotero/zotero.properties
+++ b/chrome/locale/el-GR/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/es-ES/zotero/preferences.dtd b/chrome/locale/es-ES/zotero/preferences.dtd
index d91e45b2f..e84834d62 100644
--- a/chrome/locale/es-ES/zotero/preferences.dtd
+++ b/chrome/locale/es-ES/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Tamaño de letra en las notas:">
 
 <!ENTITY zotero.preferences.miscellaneous "Miscelánea">
-<!ENTITY zotero.preferences.autoUpdate "Comprobar automáticamente si hay traductores actualizados">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Hacerlo ahora">
 <!ENTITY zotero.preferences.reportTranslationFailure "Informar de fallos en los traductores de página">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Permitir que zotero.org personalice contenido basándose en la versión actual de Zotero">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Atajos de teclado">
 
 <!ENTITY zotero.preferences.keys.openZotero "Abrir/cerrar el panel de Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Conmutar el modo de pantalla completa">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Enfocar el panel de bibliotecas">
 <!ENTITY zotero.preferences.keys.quicksearch "Búsqueda rápida">
-<!ENTITY zotero.preferences.keys.newItem "Crear un nuevo ítem">
-<!ENTITY zotero.preferences.keys.newNote "Crear una nueva nota">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Conmutar el selector de marcas">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copiar las citas para los ítems seleccionados al portapapeles">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copiar los ítems seleccionados al portapapeles">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importar desde el portapapeles">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Intentar suprimir los atajos de otras aplicaciones que coincidan">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Los cambios tendrán efecto sólo en las ventanas nuevas">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Servidores Proxies">
diff --git a/chrome/locale/es-ES/zotero/standalone.dtd b/chrome/locale/es-ES/zotero/standalone.dtd
index 399385c9c..7ed98f1a5 100644
--- a/chrome/locale/es-ES/zotero/standalone.dtd
+++ b/chrome/locale/es-ES/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Seleccionar todo">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opciones...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Preferencias">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties
index dabf4bf4a..f937f4f3d 100644
--- a/chrome/locale/es-ES/zotero/zotero.properties
+++ b/chrome/locale/es-ES/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Gestionar motores de búsqueda...
 standalone.corruptInstallation=Tu instalación Zotero parece estar corrupta debido a una fallida auto-actualización. Aunque Zotero puede seguir funcionando, para evitar posibles errores, por favor, descarga la última versión de Zotero en http://zotero.org/support/standalone tan pronto como sea posible.
 standalone.addonInstallationFailed.title=Instalación de complemento fallida
 standalone.addonInstallationFailed.body=El complemento "%S" no puede ser instalado. Puede ser incompatible con esta versión de Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Error de conector Zotero
 connector.standaloneOpen=No se puede acceder a tu base de datos debido a que Zotero Standalone está abierto. Por favor, mira tus ítems en Zotero Standalone.
diff --git a/chrome/locale/et-EE/zotero/preferences.dtd b/chrome/locale/et-EE/zotero/preferences.dtd
index 1514edc46..0956b79d4 100644
--- a/chrome/locale/et-EE/zotero/preferences.dtd
+++ b/chrome/locale/et-EE/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Märkuse fondisuurus">
 
 <!ENTITY zotero.preferences.miscellaneous "Mitmesugust">
-<!ENTITY zotero.preferences.autoUpdate "Kontrollida automaatselt uuendatud tõlkijaid">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Uuendada nüüd">
 <!ENTITY zotero.preferences.reportTranslationFailure "Anda teada vigastest tõlkijatest">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Lubada zotero.org modifitseerida sisu vastavalt Zotero versioonile">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Kiirvaliku klahvid">
 
 <!ENTITY zotero.preferences.keys.openZotero "Avada/Sulgeda Zotero aken">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Täisekraan režiim">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Kiirotsing">
-<!ENTITY zotero.preferences.keys.newItem "Uue kirje loomine">
-<!ENTITY zotero.preferences.keys.newNote "Uue kommentaari loomine">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Lipikuvalija olek">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopeerida valitud kirje tsiteeringud lõikepuhvrisse">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopeerida valitud kirjed lõikepuhvrisse">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Lõikepuhvrist importimine">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Võistlevate kiirvaliku klahvide korraldamine">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Muutused saavad nähtavaks alles uues aknas">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proksid">
diff --git a/chrome/locale/et-EE/zotero/standalone.dtd b/chrome/locale/et-EE/zotero/standalone.dtd
index f8335a79a..7f6380d62 100644
--- a/chrome/locale/et-EE/zotero/standalone.dtd
+++ b/chrome/locale/et-EE/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Valida kõik">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Seaded…">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Eelistused">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties
index 4e5f01df4..bd3dd6ba7 100644
--- a/chrome/locale/et-EE/zotero/zotero.properties
+++ b/chrome/locale/et-EE/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Autonoomne Zotero paistab olevat vigane tänu ebaõnnestunud uuendusele. Kuigi Zotero võib edasi funktsioneerida, siis võimalike vigade vältimiseks palun laadige alla viimane versioon Autonoomsest Zoterost http://zotero.org/support/standalone nii pea kui võimalik.
 standalone.addonInstallationFailed.title=Lisa paigaldamine nurjus
 standalone.addonInstallationFailed.body=Lisa "%S" paigaldamine ei õnnestunud. Tegemist võib olla versiooni mitteühildumisega Autonoomse Zoteroga.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero ühendaja viga
 connector.standaloneOpen=Andmebaasiga ei õnnestu kontakteeruda, sest Autonoomne Zotero on parajasti avatud. Palun vaadake oma kirjeid seal. 
diff --git a/chrome/locale/eu-ES/zotero/preferences.dtd b/chrome/locale/eu-ES/zotero/preferences.dtd
index 6ebafbf6e..2565faffb 100644
--- a/chrome/locale/eu-ES/zotero/preferences.dtd
+++ b/chrome/locale/eu-ES/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "font neurria oharretan:">
 
 <!ENTITY zotero.preferences.miscellaneous "Bestelakoak">
-<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Update now">
 <!ENTITY zotero.preferences.reportTranslationFailure "Report broken site translators">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Allow zotero.org to customize content based on current Zotero version">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Teklatu-komandoak">
 
 <!ENTITY zotero.preferences.keys.openZotero "Ireki/Itxi Zotero panela">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Pantaila osoa bai/ez">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Bilatu:">
-<!ENTITY zotero.preferences.keys.newItem "Item berria sortu">
-<!ENTITY zotero.preferences.keys.newNote "Ohar berria sortu">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Esteka-hautatzailea ikusi bai/ez">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Hautatutako item aipamenak arbelera kopiatu">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Hautatutako itemak arbelera kopiatu">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Arbeletik inportatu">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Aldaketak burutzeko, leiho berri bat ireki.">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties
index 358a4f7f6..bb68a420d 100644
--- a/chrome/locale/eu-ES/zotero/zotero.properties
+++ b/chrome/locale/eu-ES/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/fa/zotero/preferences.dtd b/chrome/locale/fa/zotero/preferences.dtd
index 455a2a9e4..633a1ce75 100644
--- a/chrome/locale/fa/zotero/preferences.dtd
+++ b/chrome/locale/fa/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "اندازه قلم یادداشت:">
 
 <!ENTITY zotero.preferences.miscellaneous "متفرقه">
-<!ENTITY zotero.preferences.autoUpdate "جستجوی خودکار برای روزآمدسازی مترجم‌ها">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "روزآمدسازی هم‌اکنون انجام شود">
 <!ENTITY zotero.preferences.reportTranslationFailure "گزارش مترجم‌های مشکل‌دار">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "اجازه به zotero.org برای تنظیم محتوا با توجه به نگارش زوترو">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "کلیدهای میان‌بر">
 
 <!ENTITY zotero.preferences.keys.openZotero "باز کردن/بستن قاب زوترو">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "فعال/غیرفعال کردن حالت تمام‌صفحه">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "جستجوی سریع">
-<!ENTITY zotero.preferences.keys.newItem "ساخت آیتم‌ جدید">
-<!ENTITY zotero.preferences.keys.newNote "ساخت یادداشت جدید">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "روشن/خاموش کردن انتخاب برچسب">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "رونوشت یادکرد آیتم‌های انتخاب شده به حافظه موقت">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "رونوشت آیتم‌های انتخاب شده به حافظه موقت">
 <!ENTITY zotero.preferences.keys.importFromClipboard "درون‌برد از حافظه موقت">
-<!ENTITY zotero.preferences.keys.overrideGlobal "تلاش برای لغو کلیدهای میان‌بر ناسازگار">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "تغییرات فقط در پنجره‌های جدید اعمال می‌شوند">
 
 <!ENTITY zotero.preferences.prefpane.proxies "پیشکارها">
diff --git a/chrome/locale/fa/zotero/zotero.properties b/chrome/locale/fa/zotero/zotero.properties
index bb40fcec5..5c1abc46b 100644
--- a/chrome/locale/fa/zotero/zotero.properties
+++ b/chrome/locale/fa/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=سامان‌دهی موتورهای جستجو...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/fi-FI/zotero/preferences.dtd b/chrome/locale/fi-FI/zotero/preferences.dtd
index d316d5721..a798327e8 100644
--- a/chrome/locale/fi-FI/zotero/preferences.dtd
+++ b/chrome/locale/fi-FI/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Muistiinpanojen kirjasinkoko:">
 
 <!ENTITY zotero.preferences.miscellaneous "Sekalaista">
-<!ENTITY zotero.preferences.autoUpdate "Tarkista automaattisesti sivutulkkien päivitykset">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Päivitä nyt">
 <!ENTITY zotero.preferences.reportTranslationFailure "Ilmoita toimimattomista sivutulkeista">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Anna zotero.orgin muunnella sisältöään nykyisen Zotero-version perusteella">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Avaa/sulje Zotero-ikkuna">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Koko ruudun tila">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Pikahaku">
-<!ENTITY zotero.preferences.keys.newItem "Luo uusi nimike">
-<!ENTITY zotero.preferences.keys.newNote "Luo uusi muistiinpano">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Aiheenvalitsin päälle/pois">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopioi valittujen nimikkeiden sitaatit leikepöydälle">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopioi valitut nimikkeet leikepöydälle">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Tuo leikepöydältä">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Yritä ohittaa keskenään ristiriitaiset pikanäppäimet">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Muutokset tulevat voimaan vasta uusissa ikkunoissa">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Välityspalvelimet">
diff --git a/chrome/locale/fi-FI/zotero/standalone.dtd b/chrome/locale/fi-FI/zotero/standalone.dtd
index da6dfe255..a8e73ad77 100644
--- a/chrome/locale/fi-FI/zotero/standalone.dtd
+++ b/chrome/locale/fi-FI/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Valitse kaikki">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Lisävalinnat...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Asetukset">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties
index 8da4df0be..c35048179 100644
--- a/chrome/locale/fi-FI/zotero/zotero.properties
+++ b/chrome/locale/fi-FI/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Zotero Standalone -asennuksesi vaikuttaa olevan vioittunut epäonnistuneessa automaattipäivityksessä. Zotero saattaa jatkaa toimintaansa, mutta mahdollisten virheiden välttämiseksi suosittelemme lataamaan Zotero Standalonen uusimman version osoitteesta http://zotero.org/support/standalone mahdollisimman pian.
 standalone.addonInstallationFailed.title=Lisäosan asennus epäonnistui
 standalone.addonInstallationFailed.body=Lisäosaa "%S" ei voitu asentaa. Se saattaa olla yhteensopimaton tämän Zotero Standalone -version kanssa.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector -ongelma.
 connector.standaloneOpen=Tietokantaasi ei saada yhteyttä, koska Zotero Standalone on tällä hetkellä auki. Käytä Zotero Standalonea nimikkeidesi tarkasteluun.
diff --git a/chrome/locale/fr-FR/zotero/preferences.dtd b/chrome/locale/fr-FR/zotero/preferences.dtd
index acee8dbf5..16084c835 100644
--- a/chrome/locale/fr-FR/zotero/preferences.dtd
+++ b/chrome/locale/fr-FR/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Taille des caractères des notes :">
 
 <!ENTITY zotero.preferences.miscellaneous "Divers">
-<!ENTITY zotero.preferences.autoUpdate "Vérifier automatiquement les mises à jour des convertisseurs">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Mettre à jour maintenant">
 <!ENTITY zotero.preferences.reportTranslationFailure "Signaler les convertisseurs défectueux">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Autoriser zotero.org à personnaliser le contenu en se basant sur la version actuelle de Zotero">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Raccourcis">
 
 <!ENTITY zotero.preferences.keys.openZotero "Ouvrir/fermer le panneau Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Bascule du mode plein écran">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Bascule vers le panneau Ma Bibliothèque">
 <!ENTITY zotero.preferences.keys.quicksearch "Recherche rapide">
-<!ENTITY zotero.preferences.keys.newItem "Créer un nouveau document">
-<!ENTITY zotero.preferences.keys.newNote "Créer une nouvelle note">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Bascule du sélecteur de marqueurs">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copier les citations du document sélectionné dans le presse-papiers">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copier les documents sélectionnés dans le presse-papiers">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importer du presse-papiers">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Essayer de gérer les conflits de raccourcis">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Les modifications ne prennent effet que dans les nouvelles fenêtres.">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Serveurs mandataires">
diff --git a/chrome/locale/fr-FR/zotero/standalone.dtd b/chrome/locale/fr-FR/zotero/standalone.dtd
index ef3a36911..527ed949c 100644
--- a/chrome/locale/fr-FR/zotero/standalone.dtd
+++ b/chrome/locale/fr-FR/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Tout sélectionner">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "T">
-<!ENTITY preferencesCmd.label "Options…">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "i">
 <!ENTITY preferencesCmdUnix.label "Préférences">
 <!ENTITY preferencesCmdUnix.accesskey "f">
diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties
index 2b544f261..e3d23b43a 100644
--- a/chrome/locale/fr-FR/zotero/zotero.properties
+++ b/chrome/locale/fr-FR/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Gérer les moteurs de recherche…
 standalone.corruptInstallation=Votre installation de Zotero Standalone semble être corrompue à cause de l'échec d'une mise à jour automatique. Bien que Zotero puisse continuer à fonctionner, afin d'éviter des bogues potentiels, veuillez télécharger dès que possible la dernière version de Zotero Standalone depuis http://zotero.org/support/standalone
 standalone.addonInstallationFailed.title=Échec de l'installation de l'extension
 standalone.addonInstallationFailed.body=L'extension "%S" ne peut pas être installée. Elle est peut-être incompatible avec cette version de Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Erreur du connecteur Zotero
 connector.standaloneOpen=Votre base de données est inaccessible car Zotero Standalone est actuellement ouvert. Veuillez visualiser vos documents dans Zotero Standalone.
diff --git a/chrome/locale/gl-ES/zotero/preferences.dtd b/chrome/locale/gl-ES/zotero/preferences.dtd
index 126a5a51b..be73f0def 100644
--- a/chrome/locale/gl-ES/zotero/preferences.dtd
+++ b/chrome/locale/gl-ES/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Tamaño da tipografía das notas:">
 
 <!ENTITY zotero.preferences.miscellaneous "Miscelánea">
-<!ENTITY zotero.preferences.autoUpdate "Comprobar a actualización de tradutores automaticamente">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Actualizar agora">
 <!ENTITY zotero.preferences.reportTranslationFailure "Informar de tradutores de sitio rotos">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Permitir que zotero.org personalice o contido baseandose na versión actual">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Atallos de teclado">
 
 <!ENTITY zotero.preferences.keys.openZotero "Abrir/Pechar o panel de Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Cambiar ao modo de pantalla completa">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Foco no panel de bibliotecas">
 <!ENTITY zotero.preferences.keys.quicksearch "Busca rápida">
-<!ENTITY zotero.preferences.keys.newItem "Crear un novo elemento">
-<!ENTITY zotero.preferences.keys.newNote "Crear unha nova nota">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Alternar o selector de etiquetas">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copiar as citas do elemento seleccionado ao portaretallos">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copiar os elementos seleccionados ao portaretallos">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importar do portaretallos">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Tratar de anular os accesos directos en conflito">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Os cambios só terán efecto nas novas xanelas">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/gl-ES/zotero/standalone.dtd b/chrome/locale/gl-ES/zotero/standalone.dtd
index d91d5480a..b3224ce21 100644
--- a/chrome/locale/gl-ES/zotero/standalone.dtd
+++ b/chrome/locale/gl-ES/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Escoller todo">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opcións...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Preferencias">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties
index 229dbe323..f8be0e9b9 100644
--- a/chrome/locale/gl-ES/zotero/zotero.properties
+++ b/chrome/locale/gl-ES/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Xestionar as ferramentas de busca...
 standalone.corruptInstallation=A súa instalación de Zotero Standalone semella estar corrompida por fallos nas actualizacións automáticas. Inda que poida que Zotero siga funcionando, e co fin de evitar fallos poteriores, descargue a última versión de Zotero Standalone da páxina http://zotero.org/support/standalone en canto poida.
 standalone.addonInstallationFailed.title=Fallou a instalación do engadido
 standalone.addonInstallationFailed.body=Non se puido instalar o engadido «%S». Podería ser incompatible con esta versión do Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Erro do conector de Zotero
 connector.standaloneOpen=A súa base de datos non se puido acceder xa que neste momento está aberto Zotero. Vexa os seus elementos empregando Zotero Standalone.
diff --git a/chrome/locale/he-IL/zotero/preferences.dtd b/chrome/locale/he-IL/zotero/preferences.dtd
index f3346d1a6..c292e0643 100644
--- a/chrome/locale/he-IL/zotero/preferences.dtd
+++ b/chrome/locale/he-IL/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Note font size:">
 
 <!ENTITY zotero.preferences.miscellaneous "שונות">
-<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "עדכן עכשיו">
 <!ENTITY zotero.preferences.reportTranslationFailure "דווח על מתרגמי אתרים פגומים">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Allow zotero.org to customize content based on current Zotero version">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "פתח/סגור חלונות Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Toggle Fullscreen Mode">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "חיפוש מהיר">
-<!ENTITY zotero.preferences.keys.newItem "צור פריט חדש">
-<!ENTITY zotero.preferences.keys.newNote "Create a new note">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Toggle Tag Selector">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copy Selected Item Citations to Clipboard">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copy Selected Items to Clipboard">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Changes take effect in new windows only">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/he-IL/zotero/standalone.dtd b/chrome/locale/he-IL/zotero/standalone.dtd
index 964754a02..eab2bffcf 100644
--- a/chrome/locale/he-IL/zotero/standalone.dtd
+++ b/chrome/locale/he-IL/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "בחר הכל">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "אפשרויות...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "העדפות">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties
index 515bcaa3f..6f863682f 100644
--- a/chrome/locale/he-IL/zotero/zotero.properties
+++ b/chrome/locale/he-IL/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/hr-HR/zotero/preferences.dtd b/chrome/locale/hr-HR/zotero/preferences.dtd
index 46834b1b0..3dd89d77b 100644
--- a/chrome/locale/hr-HR/zotero/preferences.dtd
+++ b/chrome/locale/hr-HR/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Note font size:">
 
 <!ENTITY zotero.preferences.miscellaneous "Miscellaneous">
-<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Update now">
 <!ENTITY zotero.preferences.reportTranslationFailure "Report broken site translators">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Allow zotero.org to customize content based on current Zotero version">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Toggle Fullscreen Mode">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Quick Search">
-<!ENTITY zotero.preferences.keys.newItem "Create a new item">
-<!ENTITY zotero.preferences.keys.newNote "Create a new note">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Toggle Tag Selector">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copy Selected Item Citations to Clipboard">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copy Selected Items to Clipboard">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Changes take effect in new windows only">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties
index e88d80c55..6ed16aa96 100644
--- a/chrome/locale/hr-HR/zotero/zotero.properties
+++ b/chrome/locale/hr-HR/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/hu-HU/zotero/preferences.dtd b/chrome/locale/hu-HU/zotero/preferences.dtd
index fdcd44567..62c400342 100644
--- a/chrome/locale/hu-HU/zotero/preferences.dtd
+++ b/chrome/locale/hu-HU/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Jegyzet betűmérete:">
 
 <!ENTITY zotero.preferences.miscellaneous "Egyéb">
-<!ENTITY zotero.preferences.autoUpdate "Konverter-frissítések automatikus ellenőrzése">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Frissítés indítása">
 <!ENTITY zotero.preferences.reportTranslationFailure "Hibás adatkonverterek jelentése">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "A Zotero verziójának megfelelő tartalmak mutatása a zotero.org oldalon">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Billentyűparancsok">
 
 <!ENTITY zotero.preferences.keys.openZotero "Zotero megnyitása/bezárása">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Teljesképernyős üzemmód">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Gyorskeresés">
-<!ENTITY zotero.preferences.keys.newItem "Új elem létrehozása">
-<!ENTITY zotero.preferences.keys.newNote "Új jegyzet létrehozása">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Címkeválasztó mutatása/elrejtése">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kiválasztott hivatkozás másolása a vágólapra">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kiválasztott elemek másolása a vágólapra">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importálás a vágólapról">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Ellentmondó billentyűparancsok felülírása">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "A változások csak az új ablakokban érvényesülnek">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxyk">
diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties
index 0055cecb8..f9b32b73b 100644
--- a/chrome/locale/hu-HU/zotero/zotero.properties
+++ b/chrome/locale/hu-HU/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/id-ID/zotero/preferences.dtd b/chrome/locale/id-ID/zotero/preferences.dtd
index 3026d6b16..443bdad9d 100644
--- a/chrome/locale/id-ID/zotero/preferences.dtd
+++ b/chrome/locale/id-ID/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Ukuran font catatan:">
 
 <!ENTITY zotero.preferences.miscellaneous "Lain-lain">
-<!ENTITY zotero.preferences.autoUpdate "Periksa pemutakhiran translator secara automatis">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Mutakhirkan sekarang">
 <!ENTITY zotero.preferences.reportTranslationFailure "Laporkan kerusakan translator situs">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Izinkan zotero.org untuk menyusun konten berdasarkan versi Zotero sekarang">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut">
 
 <!ENTITY zotero.preferences.keys.openZotero "Buka/Tutup  Jendela Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Hidupkan/Matikan Mode Layar Penuh">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Fokus Jendela Pustaka">
 <!ENTITY zotero.preferences.keys.quicksearch "Pencarian Cepat">
-<!ENTITY zotero.preferences.keys.newItem "Buat sebuah item baru">
-<!ENTITY zotero.preferences.keys.newNote "Buat sebuah catatan baru">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Munculkan/Sembunyikan Selektor Tag">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Salin Sitasi Item Terpilih ke Clipboard">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Salin Item Terpilih ke Clipboard">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Impor dari Clipboard">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Usahakan kendalikan shortcut yang berkontradiksi">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Perubahan hanya berlaku pada jendela baru saja">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proksi">
diff --git a/chrome/locale/id-ID/zotero/standalone.dtd b/chrome/locale/id-ID/zotero/standalone.dtd
index 55e14d719..4fe02a3bd 100644
--- a/chrome/locale/id-ID/zotero/standalone.dtd
+++ b/chrome/locale/id-ID/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Pilih Semua">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Pilihan...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Preferensi">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/id-ID/zotero/zotero.properties b/chrome/locale/id-ID/zotero/zotero.properties
index 4eefcdf43..b84d9f49b 100644
--- a/chrome/locale/id-ID/zotero/zotero.properties
+++ b/chrome/locale/id-ID/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Kelola Mesin Pencarian...
 standalone.corruptInstallation=Instalasi Zotero Standalone Anda tampak mengalami kerusakan yang diakibatkan oleh kegagalan pemutakhiran secara automatis. Meskipun Zotero dapat tetap berfungsi, untuk menghindari bug-bug potensial, silakan unduh versi terbaru Zotero Standalone dari http://zotero.org/support/standalone sesegera mungkin.
 standalone.addonInstallationFailed.title=Instalasi Pengaya Gagal
 standalone.addonInstallationFailed.body=Pengaya "%S" tidak dapat diinstal. Pengaya mungkin tidak kompatibel dengan versi Zotero Standalone saat ini.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Konektor Zotero Mengalami Kesalahan
 connector.standaloneOpen=Database Anda tidak dapat diakses karena Zotero Standalone Anda sedang terbuka. Silakan lihat item-item Anda di dalam Zotero Standalone.
diff --git a/chrome/locale/is-IS/zotero/preferences.dtd b/chrome/locale/is-IS/zotero/preferences.dtd
index 489f79c49..4564aedb9 100644
--- a/chrome/locale/is-IS/zotero/preferences.dtd
+++ b/chrome/locale/is-IS/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Note font size:">
 
 <!ENTITY zotero.preferences.miscellaneous "Miscellaneous">
-<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Uppfæra núna">
 <!ENTITY zotero.preferences.reportTranslationFailure "Report broken site translators">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Allow zotero.org to customize content based on current Zotero version">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Flýtihnappar">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Toggle Fullscreen Mode">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Flýtileit">
-<!ENTITY zotero.preferences.keys.newItem "Create a new item">
-<!ENTITY zotero.preferences.keys.newNote "Create a new note">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Toggle Tag Selector">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copy Selected Item Citations to Clipboard">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copy Selected Items to Clipboard">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Changes take effect in new windows only">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties
index 9993ad43c..61966a8fb 100644
--- a/chrome/locale/is-IS/zotero/zotero.properties
+++ b/chrome/locale/is-IS/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/it-IT/zotero/preferences.dtd b/chrome/locale/it-IT/zotero/preferences.dtd
index 5fc8ae9d7..65f358012 100644
--- a/chrome/locale/it-IT/zotero/preferences.dtd
+++ b/chrome/locale/it-IT/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Dimensione del testo delle note:">
 
 <!ENTITY zotero.preferences.miscellaneous "Varie">
-<!ENTITY zotero.preferences.autoUpdate "Verifica automaticamente la disponibilità di nuovi motori di ricerca">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Aggiorna adesso">
 <!ENTITY zotero.preferences.reportTranslationFailure "Segnala motori di ricerca non funzionanti">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Permetti al sito zotero.org di personalizzare i contenuti in base alla versione installata di Zotero">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Scorciatoie da tastiera">
 
 <!ENTITY zotero.preferences.keys.openZotero "Apri o chiudi pannello di Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Attiva o disattiva schermo intero">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Ricerca veloce">
-<!ENTITY zotero.preferences.keys.newItem "Crea nuovo elemento">
-<!ENTITY zotero.preferences.keys.newNote "Crea nuova nota">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Attiva o disattiva selettore tag">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copia l&apos;elemento selezionato negli Appunti">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copia gli elementi selezionati negli Appunti">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importa dagli appunti">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Sovrascrivi le scorciatoie in conflitto">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Le modifiche avranno effetto nelle nuove finestre">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxy">
diff --git a/chrome/locale/it-IT/zotero/standalone.dtd b/chrome/locale/it-IT/zotero/standalone.dtd
index 8d8c9af93..a09724f3d 100644
--- a/chrome/locale/it-IT/zotero/standalone.dtd
+++ b/chrome/locale/it-IT/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Seleziona tutto">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opzioni...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Preferenze">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties
index 1d0ca03da..3be098c9f 100644
--- a/chrome/locale/it-IT/zotero/zotero.properties
+++ b/chrome/locale/it-IT/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=L'installazione di Zotero Standalone sembra essere corrotta in seguito a un aggiornamento automatico non andato a buon fine. Nonostante Zotero possa continuare a funzionare, per evitare possibili problemi, scaricare l'ultima versione di Zotero Standalone da http://zotero.org/support/standalone il più presto possibile.
 standalone.addonInstallationFailed.title=Installazione dell'estensione non riuscita
 standalone.addonInstallationFailed.body=Non è stato possibile installare l'estensione "%S". Potrebbe essere incompatibile con questa versione di Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Errore di Zotero Connector
 connector.standaloneOpen=Non è possibile accedere al database perché Zotero Standalone è attualmente in esecuzione. Consultare i propri dati con Zotero Standalone.
diff --git a/chrome/locale/ja-JP/zotero/preferences.dtd b/chrome/locale/ja-JP/zotero/preferences.dtd
index 1216fb006..741af16fc 100644
--- a/chrome/locale/ja-JP/zotero/preferences.dtd
+++ b/chrome/locale/ja-JP/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "メモの文字サイズ:">
 
 <!ENTITY zotero.preferences.miscellaneous "各種設定">
-<!ENTITY zotero.preferences.autoUpdate "更新されたサイト・トランスレータを自動的に確認">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "今すぐ更新">
 <!ENTITY zotero.preferences.reportTranslationFailure "壊れたサイト・トランスレータを報告する">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "現行の Zotero のバージョンに基づいて zotero.org が内容をカスタマイズすることを許可する">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "ショートカットキー">
 
 <!ENTITY zotero.preferences.keys.openZotero "Zotero 画面を開く／閉じる">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "全画面表示の切り替え">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "ライブラリ画面へ">
 <!ENTITY zotero.preferences.keys.quicksearch "簡易検索">
-<!ENTITY zotero.preferences.keys.newItem "新規アイテムを作成">
-<!ENTITY zotero.preferences.keys.newNote "新規メモを作成">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "タグ選択ボックスを表示する／隠す">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "選択されたアイテムの出典表記をクリップボードにコピー">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "選択されたアイテムの参考文献目録をクリップボードにコピー">
 <!ENTITY zotero.preferences.keys.importFromClipboard "クリップボードからインポート">
-<!ENTITY zotero.preferences.keys.overrideGlobal "衝突するショートカットを上書きする">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "変更を有効にするためには、新規画面を開いてください">
 
 <!ENTITY zotero.preferences.prefpane.proxies "プロキシ">
diff --git a/chrome/locale/ja-JP/zotero/standalone.dtd b/chrome/locale/ja-JP/zotero/standalone.dtd
index 8dde26de6..b4c1d5332 100644
--- a/chrome/locale/ja-JP/zotero/standalone.dtd
+++ b/chrome/locale/ja-JP/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "すべてを選択">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "オプション...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "環境設定...">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties
index 93cdcff28..05d3e3c03 100644
--- a/chrome/locale/ja-JP/zotero/zotero.properties
+++ b/chrome/locale/ja-JP/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=所在確認エンジンの管理...
 standalone.corruptInstallation=インストール済みのスタンドアローン版 Zotero は自動更新の失敗により損傷した模様です。Firefox 版 Zotero はそれでも機能しますが、潜在的なバグを避けるために最新版のスタンドアローン版 Zotero を http://zotero.org/support/standalone から直ちにダウンロードして下さい。
 standalone.addonInstallationFailed.title=アドオンのインストールに失敗しました
 standalone.addonInstallationFailed.body=アドオン "%S" をインストールすることができませんでした。このバージョンのスタンドアローン版 Zotero とは互換性がない恐れがあります。
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero コネクタのエラー
 connector.standaloneOpen=スタンドアローン版 Zotero が現在立ち上がっているため、 あなたのデータベースにアクセスすることができません。アイテムはスタンドアローン版 Zotero の中で閲覧してください。
diff --git a/chrome/locale/km/zotero/preferences.dtd b/chrome/locale/km/zotero/preferences.dtd
index 1b59e5b5c..8e93df472 100644
--- a/chrome/locale/km/zotero/preferences.dtd
+++ b/chrome/locale/km/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "ទំហំអក្សរកំណត់ចំណាំៈ">
 
 <!ENTITY zotero.preferences.miscellaneous "ជម្រើសនានា">
-<!ENTITY zotero.preferences.autoUpdate "ស្វែងរកកូដចម្លងទំនើបទាន់សម័យដោយស្វ័យប្រវត្តិ">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "ធ្វើទំនើបកម្មឥលូវ">
 <!ENTITY zotero.preferences.reportTranslationFailure "រាយការណ៍កូដចម្លងគេហទំព័រខូច">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "ទុកឲ zotero.org ផ្លាស់ប្តូរខ្លឹមសារដោយអនុលោមទៅតាមកំណែហ្ស៊ូតេរ៉ូថ្មី">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "ផ្លូវកាត់">
 
 <!ENTITY zotero.preferences.keys.openZotero "បើក/បិទផ្ទាំងហ្ស៊ូតេរ៉ូ">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "បើកពេញអេក្រង់">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "ស្វែងរកលឿន">
-<!ENTITY zotero.preferences.keys.newItem "បង្កើតឯកសារថ្មី">
-<!ENTITY zotero.preferences.keys.newNote "បង្កើតកំណត់ត្រាថ្មី">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "បើកជម្រើសស្លាក">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "ចម្លងអាគតដ្ឋានឯកសារដែលបានជ្រើសរើសទៅកាន់កន្លែងរក្សាទុកឯកសារបណ្តោះអាសន្ន">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "ចម្លងឯកសារដែលបានជ្រើសរើសកន្លែងរក្សាទុកឯកសារបណ្តោះអាសន្ន">
 <!ENTITY zotero.preferences.keys.importFromClipboard "ទាញឯកសារចេញពីកន្លែងរក្សាទុកឯកសារបណ្តោះអាសន្ន">
-<!ENTITY zotero.preferences.keys.overrideGlobal "ព្យាយាមជំនះផ្លូវកាត់ដែលមានការទង្គិច">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "បំលាស់ប្តូរអាចមានសុពលភាពនៅលើវីនដូយ៍ថ្មីតែប៉ុណ្ណោះ">
 
 <!ENTITY zotero.preferences.prefpane.proxies "សិទ្ធិប្រទាន">
diff --git a/chrome/locale/km/zotero/standalone.dtd b/chrome/locale/km/zotero/standalone.dtd
index 2cf88d8a8..0517a7a19 100644
--- a/chrome/locale/km/zotero/standalone.dtd
+++ b/chrome/locale/km/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "ជ្រើសរើសទាំងអស់">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "ជម្រើស…">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "ជម្រើសអាទិភាព">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/km/zotero/zotero.properties b/chrome/locale/km/zotero/zotero.properties
index 560a3a8fa..9deef5df8 100644
--- a/chrome/locale/km/zotero/zotero.properties
+++ b/chrome/locale/km/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=គ្រប់គ្រងម៉ាស៊ីនស
 standalone.corruptInstallation=ការដំឡើងហ្ស៊ូតេរ៉ូស្វ័យដំណើរការរបស់អ្នកបានខូចដោយសារតែស្វ័យទំនើបកម្មបរាជ័យ។ ខណៈដែលហ្ស៊ូតេរ៉ូបន្តដំណើរការ ដើម្បីចៀសវាងកំហុស​ដែល​​អាច​កើតមាន សូមធ្វើការទាញយកកំណែថ្មីបំផុតនៃហ្ស៊ូតេរ៉ូស្វ័យ​ដំណើរការពី http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=ការដំឡើងកម្មវិធីកម្ជាប់បានបរាជ័យ
 standalone.addonInstallationFailed.body=កម្មវិធីកម្ជាប់ "%S" មិនអាចដំឡើងបានទេ។ កម្មវិធីនេះមានវិសមិតភាពជា​មួយ​ហ្ស៊ូតេរ៉ូស្វ័យ​ដំណើរ​ការ។
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=កម្ជាប់ហ្ស៊ូតេរ៉ូបានជួបបញ្ហា
 connector.standaloneOpen=ទិន្នន័យរបស់អ្នកមិនអាចចូលមើលបានទេ ដោយសារតែហ្ស៊ូតេរ៉ូស្វ័យ​ដំណើរការនៅបើកនៅឡើយ។ សូមមើលឯកសាររបស់អ្នកនៅក្នុង​ហ្ស៊ូតេរ៉ូ​ស្វ័យ​ដំណើរការ។
diff --git a/chrome/locale/ko-KR/zotero/preferences.dtd b/chrome/locale/ko-KR/zotero/preferences.dtd
index f822e9639..9a102b815 100644
--- a/chrome/locale/ko-KR/zotero/preferences.dtd
+++ b/chrome/locale/ko-KR/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "노트 글꼴 크기:">
 
 <!ENTITY zotero.preferences.miscellaneous "기타">
-<!ENTITY zotero.preferences.autoUpdate "중계기 업데이트 자동 확인">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "지금 업데이트">
 <!ENTITY zotero.preferences.reportTranslationFailure "고장난 사이트 중계기 신고">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "zotero.org가 현재 Zotero 버전의 정보를 사용하여 기능을 개선하도록 허락">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "단축키">
 
 <!ENTITY zotero.preferences.keys.openZotero "Zotero 패널 열기/닫기">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "전체화면 끄기/켜기">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "빠른 검색">
-<!ENTITY zotero.preferences.keys.newItem "새 항목 작성">
-<!ENTITY zotero.preferences.keys.newNote "새 노트 작성">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "태그 선택기 끄기/켜기">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "선택된 항목 인용을 클립보드에 복사">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "선택된 항목을 클립보드에 복사">
 <!ENTITY zotero.preferences.keys.importFromClipboard "클립보드에서 불러오기">
-<!ENTITY zotero.preferences.keys.overrideGlobal "충돌하는 단축키는 무시합니다.">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "새 창에서만 변경한 효과가 나타납니다">
 
 <!ENTITY zotero.preferences.prefpane.proxies "프록시">
diff --git a/chrome/locale/ko-KR/zotero/standalone.dtd b/chrome/locale/ko-KR/zotero/standalone.dtd
index a2bdc69e7..670cb39c7 100644
--- a/chrome/locale/ko-KR/zotero/standalone.dtd
+++ b/chrome/locale/ko-KR/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "모두 선택">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "환경설정">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "설정">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties
index a6405d8ad..00c274bb9 100644
--- a/chrome/locale/ko-KR/zotero/zotero.properties
+++ b/chrome/locale/ko-KR/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Zotero Standalone의 설치가 자동 업데이트 실패로 인해 손상된 것 같습니다. Zotero가 실행된다고 해도 잠재적인 오류가 있을 수 있으니, 가능한 한 빨리 http://zotero.org/support/standalone에서 Zotero Standalone의 최신 버전을 다운 받으시기 바랍니다.
 standalone.addonInstallationFailed.title=애드-온 설치 실패
 standalone.addonInstallationFailed.body="%S" 애드-온가 설치되지 않았습니다. 해당 애드-온이 Zotero Standalone의 현재 버전과 맞지 않을 수 있습니다. 
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero 커넥터 오류
 connector.standaloneOpen=Zotero Standalone이 실행중이기 때문에 데이터베이스 접근에 실패했습니다. Zotero Standalone에서 항목을 보시기 바랍니다.
diff --git a/chrome/locale/mn-MN/zotero/preferences.dtd b/chrome/locale/mn-MN/zotero/preferences.dtd
index 5203b23b2..fcd0d027a 100644
--- a/chrome/locale/mn-MN/zotero/preferences.dtd
+++ b/chrome/locale/mn-MN/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Note font size:">
 
 <!ENTITY zotero.preferences.miscellaneous "Miscellaneous">
-<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Update now">
 <!ENTITY zotero.preferences.reportTranslationFailure "Report broken site translators">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Allow zotero.org to customize content based on current Zotero version">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Toggle Fullscreen Mode">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Хурдан хайх">
-<!ENTITY zotero.preferences.keys.newItem "Create a new item">
-<!ENTITY zotero.preferences.keys.newNote "Create a new note">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Toggle Tag Selector">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copy Selected Item Citations to Clipboard">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copy Selected Items to Clipboard">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Changes take effect in new windows only">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties
index b05224d01..1c83b9bce 100644
--- a/chrome/locale/mn-MN/zotero/zotero.properties
+++ b/chrome/locale/mn-MN/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/nb-NO/zotero/preferences.dtd b/chrome/locale/nb-NO/zotero/preferences.dtd
index 83151f3f1..5378d3845 100644
--- a/chrome/locale/nb-NO/zotero/preferences.dtd
+++ b/chrome/locale/nb-NO/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Note font size:">
 
 <!ENTITY zotero.preferences.miscellaneous "Diverse">
-<!ENTITY zotero.preferences.autoUpdate "Sjekk automatisk for oppdaterte oversettere">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Oppdater nå">
 <!ENTITY zotero.preferences.reportTranslationFailure "Rapporter ødelagte nettstedoversettere">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Allow zotero.org to customize content based on current Zotero version">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Hurtigtaster">
 
 <!ENTITY zotero.preferences.keys.openZotero "Åpne/lukk Zotero-panelet">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Fullskjerm av/på">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Hurtigsøk">
-<!ENTITY zotero.preferences.keys.newItem "Lag et nytt element">
-<!ENTITY zotero.preferences.keys.newNote "Lag et nytt notat">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Slå taggvelgeren av/på">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopier de valgte element-henvisningene til utklippstavla.">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopier de valgte elementene til utklippstavla.">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Forsøk å overstyre snarveier i konflikt">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Endringer gjelder kun for nye vinduer">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties
index 618fd7330..f3de19620 100644
--- a/chrome/locale/nb-NO/zotero/zotero.properties
+++ b/chrome/locale/nb-NO/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/nl-NL/zotero/preferences.dtd b/chrome/locale/nl-NL/zotero/preferences.dtd
index 820ac8ee0..3c91aaa2d 100644
--- a/chrome/locale/nl-NL/zotero/preferences.dtd
+++ b/chrome/locale/nl-NL/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Tekengrootte aantekeningen:">
 
 <!ENTITY zotero.preferences.miscellaneous "Diversen">
-<!ENTITY zotero.preferences.autoUpdate "Automatisch zoeken naar bijgewerkte vertalers">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Nu bijwerken">
 <!ENTITY zotero.preferences.reportTranslationFailure "Defecte webpagina-vertalers rapporteren">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "zotero.org toestaan om inhoud aan te passen aan de gebruikte Zotero-versie">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Sneltoetsen">
 
 <!ENTITY zotero.preferences.keys.openZotero "Openen/Sluiten van Zotero-paneel">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Volledige schermweergave">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Snelzoeken">
-<!ENTITY zotero.preferences.keys.newItem "Nieuw object aanmaken">
-<!ENTITY zotero.preferences.keys.newNote "Nieuwe aantekening aanmaken">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Label-kiezer tonen">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Verwijzingen van geselecteerde objecten naar klembord kopiëren">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Geselecteerde objecten naar klembord kopiëren">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importeren vanaf klembord">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Probeer voorrang te krijgen bij conflicterende sneltoetsen">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Aanpassingen worden pas zichtbaar in nieuwe vensters">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxy's">
diff --git a/chrome/locale/nl-NL/zotero/standalone.dtd b/chrome/locale/nl-NL/zotero/standalone.dtd
index da8ea332d..d1063b910 100644
--- a/chrome/locale/nl-NL/zotero/standalone.dtd
+++ b/chrome/locale/nl-NL/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Alles selecteren">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opties…">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Voorkeuren">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties
index 9a30db83f..747d83967 100644
--- a/chrome/locale/nl-NL/zotero/zotero.properties
+++ b/chrome/locale/nl-NL/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Opzoekmechanismes beheren…
 standalone.corruptInstallation=Uw Zotero Stand-Alone-installatie lijkt beschadigd te zijn door een mislukte automatische update. Hoewel Zotero kan blijven werken, is het aan te raden om zo snel mogelijk de nieuwste versie van Zotero Stand-Alone te downloaden vanaf http://zotero.org/support/standalone om bugs te voorkomen.
 standalone.addonInstallationFailed.title=Add-on-installatie mislukt
 standalone.addonInstallationFailed.body=De add-on "%S" kon niet geïnstalleerd worden. Het kan incompatibel zijn met deze versie van Zotero Stand-Alone
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector-fout
 connector.standaloneOpen=Er is geen toegang mogelijk tot uw database omdat Zotero Stand-Alone is geopend. Bekijk uw objecten in Zotero Stand-Alone.
diff --git a/chrome/locale/nn-NO/zotero/preferences.dtd b/chrome/locale/nn-NO/zotero/preferences.dtd
index 539e03336..c5ecb25f4 100644
--- a/chrome/locale/nn-NO/zotero/preferences.dtd
+++ b/chrome/locale/nn-NO/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Skriftstorleik på notat:">
 
 <!ENTITY zotero.preferences.miscellaneous "Diverse">
-<!ENTITY zotero.preferences.autoUpdate "Sjekk automatisk for oppdaterte omsetjarar">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Oppdater no">
 <!ENTITY zotero.preferences.reportTranslationFailure "Rapporter øydelagte nettstadomsetjarar">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "La zotero.org justera innhald ut frå installert versjon av Zotero">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Snøggtastar">
 
 <!ENTITY zotero.preferences.keys.openZotero "Opne/lukk Zotero-panelet">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Fullskjerm av/på">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Hurtigsøk">
-<!ENTITY zotero.preferences.keys.newItem "Lag eit nytt element">
-<!ENTITY zotero.preferences.keys.newNote "Lag eit nytt notat">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Slå merkeveljaren av/på">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopier dei valde siteringane til utklipptavla.">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopier dei valde elementa til utklipptavla.">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Forsøk å overstyra snøggtastar i konflikt">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Endringar gjeld berre for nye vindauge">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Mellomtenarar">
diff --git a/chrome/locale/nn-NO/zotero/standalone.dtd b/chrome/locale/nn-NO/zotero/standalone.dtd
index 63822d0e2..1f9b2b9b1 100644
--- a/chrome/locale/nn-NO/zotero/standalone.dtd
+++ b/chrome/locale/nn-NO/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Merk alt">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Innstillingar …">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "I">
 <!ENTITY preferencesCmdUnix.label "Innstillingar">
 <!ENTITY preferencesCmdUnix.accesskey "I">
diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties
index a0cf69f1e..7466d5d56 100644
--- a/chrome/locale/nn-NO/zotero/zotero.properties
+++ b/chrome/locale/nn-NO/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines…
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/pl-PL/zotero/preferences.dtd b/chrome/locale/pl-PL/zotero/preferences.dtd
index d44bccbfc..06cd73c53 100644
--- a/chrome/locale/pl-PL/zotero/preferences.dtd
+++ b/chrome/locale/pl-PL/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Wielkość czcionki notatek:">
 
 <!ENTITY zotero.preferences.miscellaneous "Różne">
-<!ENTITY zotero.preferences.autoUpdate "Automatycznie sprawdzaj, czy są dostępne aktualizacje">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Aktualizuj">
 <!ENTITY zotero.preferences.reportTranslationFailure "Zgłoś stronę z niedziałającym tłumaczeniem">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Pozwól zotero.org dostosować zawartość opierając się na aktualnej wersji Zotero">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Skróty klawiaturowe">
 
 <!ENTITY zotero.preferences.keys.openZotero "Otwórz/Zamknij okno Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Przełącz w tryb pełnoekranowy">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Szybkie wyszukiwanie">
-<!ENTITY zotero.preferences.keys.newItem "Utwórz nowy element">
-<!ENTITY zotero.preferences.keys.newNote "Utwórz nową notatkę">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Wyświetl/Ukryj wybór etykiet">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopiuje wybrane odnośniki bibliograficzne do schowka">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopiuj zaznaczony element do schowka">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importuj ze schowka">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Spróbuj pominąć powtarzające się skróty">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Zmiany zostaną zastosowane w nowym oknie">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Serwery proxy">
diff --git a/chrome/locale/pl-PL/zotero/standalone.dtd b/chrome/locale/pl-PL/zotero/standalone.dtd
index a9c329420..29a762f9c 100644
--- a/chrome/locale/pl-PL/zotero/standalone.dtd
+++ b/chrome/locale/pl-PL/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Zaznacz wszystko">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opcje...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Ustawienia">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties
index 004cce188..2de3c4d06 100644
--- a/chrome/locale/pl-PL/zotero/zotero.properties
+++ b/chrome/locale/pl-PL/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Zarządzanie silnikami wyszukiwania...
 standalone.corruptInstallation=Twoja instalacja samodzielnego programu Zotero jest prawdopodobnie uszkodzona z powodu nieprawidłowej automatycznej aktualizacji. Mimo tego Zotero może działać, jednak aby uniknąć potencjalnych błędów, proszę jak najszybciej pobrać najnowszą wersję samodzielnego programu Zotero ze strony http://zotero.org/support/standalone.
 standalone.addonInstallationFailed.title=Instalacja dodatku nie powiodła się.
 standalone.addonInstallationFailed.body=Nie można zainstalować dodatku "%S". Może on być niezgodny z tą wersją samodzielnego programu Zotero.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Błąd połączenia Zotero
 connector.standaloneOpen=Nie można uzyskać dostępu do twojej bazy danych, ponieważ samodzielny program Zotero jest uruchomiony. Możesz przeglądać swoje zbiory w samodzielnym programie Zotero.
diff --git a/chrome/locale/pt-BR/zotero/preferences.dtd b/chrome/locale/pt-BR/zotero/preferences.dtd
index d5a09ea02..555358a94 100644
--- a/chrome/locale/pt-BR/zotero/preferences.dtd
+++ b/chrome/locale/pt-BR/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Tamanho da fonte das notas:">
 
 <!ENTITY zotero.preferences.miscellaneous "Outras preferências">
-<!ENTITY zotero.preferences.autoUpdate "Verificar atualização de tradutores automaticamente">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Atualizar agora">
 <!ENTITY zotero.preferences.reportTranslationFailure "Informar problemas com sites de tradutores">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Permitir que zotero.org personalize o conteúdo baseado em sua versão atual do Zotero">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Teclas de atalho">
 
 <!ENTITY zotero.preferences.keys.openZotero "Abrir/Fechar painel Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Modo Tela Cheia">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Concentrar o painel Bibliotecas">
 <!ENTITY zotero.preferences.keys.quicksearch "Pesquisa rápida">
-<!ENTITY zotero.preferences.keys.newItem "Criar um novo item">
-<!ENTITY zotero.preferences.keys.newNote "Criar uma nova nota">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Alternar seletor de marcadores">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copiar citações de item selecionado para a área de transferência">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copiar itens selecionados para a área de transferência">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importar da área de transferência">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Tentar sobrescrefer conflitos de teclas de atalho">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Mudanças tem efeito apenas em novas janelas">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/pt-BR/zotero/standalone.dtd b/chrome/locale/pt-BR/zotero/standalone.dtd
index 472d61a61..b05bbc8ed 100644
--- a/chrome/locale/pt-BR/zotero/standalone.dtd
+++ b/chrome/locale/pt-BR/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Selecionar tudo">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opções...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Preferências">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties
index 78a2ed09c..25ec8fa11 100644
--- a/chrome/locale/pt-BR/zotero/zotero.properties
+++ b/chrome/locale/pt-BR/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Sua instalação do Zotero Standalone parece estar corrompida devido a uma falha na atualização automática. Embora o Zotero cotinue a funcionar, para evitar bugs potenciais, por favor, faça o quanto antes o download da última versão do Zotero Standalone em http://zotero.org/support/standalone.
 standalone.addonInstallationFailed.title=A instalação da extensão falhou
 standalone.addonInstallationFailed.body=Essa extensão "%S" não pode ser instalada. Ela pode ser incompatível com essa versão do Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Falha do conector do Zotero
 connector.standaloneOpen=Sua base de dados não pode ser acessada porque o Zotero Standalone está aberto no momento. Por favor, veja seus itens no Zotero Standalone.
diff --git a/chrome/locale/pt-PT/zotero/preferences.dtd b/chrome/locale/pt-PT/zotero/preferences.dtd
index a78e66ad4..b0994035a 100644
--- a/chrome/locale/pt-PT/zotero/preferences.dtd
+++ b/chrome/locale/pt-PT/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Tamanho da fonte tipográfica das notas:">
 
 <!ENTITY zotero.preferences.miscellaneous "Variadas">
-<!ENTITY zotero.preferences.autoUpdate "Verificar automaticamente actualizações de tradutores">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Actualizar agora">
 <!ENTITY zotero.preferences.reportTranslationFailure "Reportar tradutores de sítios com problemas">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Autorizar zotero.org a personalizar o conteúdo com base na versão actual">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Teclas de Atalho">
 
 <!ENTITY zotero.preferences.keys.openZotero "Abrir/Fechar Painel do Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Alternar Modo de Ecrã Inteiro">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Foco no Painel de Bibliotecas">
 <!ENTITY zotero.preferences.keys.quicksearch "Procura Rápida">
-<!ENTITY zotero.preferences.keys.newItem "Criar um novo item">
-<!ENTITY zotero.preferences.keys.newNote "Criar uma nova nota">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Alternar Selector de Etiquetas">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copiar Citações de Itens Seleccionadas">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copiar Itens Seleccionados">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importar dos Recortes">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Tentar sobrepor atalhos em conflito">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "As alterações têm efeito apenas em novas janelas">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Cópias locais">
diff --git a/chrome/locale/pt-PT/zotero/standalone.dtd b/chrome/locale/pt-PT/zotero/standalone.dtd
index 064204ee0..ef01c441d 100644
--- a/chrome/locale/pt-PT/zotero/standalone.dtd
+++ b/chrome/locale/pt-PT/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Seleccionar Tudo">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opções...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Preferências">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties
index 96f19278f..2b3692e58 100644
--- a/chrome/locale/pt-PT/zotero/zotero.properties
+++ b/chrome/locale/pt-PT/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=A sua instância do Zotero Standalone parece estar corrompida devido a uma auto-actualização falhada. Apesar de o Zotero continuar a funcionar, para evitar possíveis erros, descarregue a última versão do Zotero Standalone a partir de http://zotero.org/support/standalone e instale-a logo que possível.
 standalone.addonInstallationFailed.title=Instalação da Extensão Falhou
 standalone.addonInstallationFailed.body=Não foi possível instalar a extensão "%S". É possível que não seja compatível com esta versão do Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Erro no Conector Zotero
 connector.standaloneOpen=Não foi possível aceder à sua base de dados, pois o Zotero Standalone está aberto. Por favor veja os seus itens nessa aplicação.
diff --git a/chrome/locale/ro-RO/zotero/preferences.dtd b/chrome/locale/ro-RO/zotero/preferences.dtd
index 962fd1466..974981a09 100644
--- a/chrome/locale/ro-RO/zotero/preferences.dtd
+++ b/chrome/locale/ro-RO/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Mărimea fontului pentru notă:">
 
 <!ENTITY zotero.preferences.miscellaneous "Diverse">
-<!ENTITY zotero.preferences.autoUpdate "Controlează automat dacă există traduceri actualizate">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Actualizează acum">
 <!ENTITY zotero.preferences.reportTranslationFailure "Raportează site-uri cu legături rupte (la translatare)">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Permite zotero.org să modifice conținutul pe bază versiunii curente de Zotero">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Scurtături de la tastatură">
 
 <!ENTITY zotero.preferences.keys.openZotero "Deschide/Închide panoul Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Extinde pe tot ecranul">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Panou de focalizare biblioteci">
 <!ENTITY zotero.preferences.keys.quicksearch "Căutare rapidă">
-<!ENTITY zotero.preferences.keys.newItem "Creează o înregistrare nouă">
-<!ENTITY zotero.preferences.keys.newNote "Creează o notă nouă">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Afișează/ascunde selectorul de etichete">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copiază citările înregistrărilor selectate în memoria Clipboard">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copiază înregistrările selectate în memoria Clipboard">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importă din memoria Clipboard">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Încearcă să suprascrii scurtăturile care sunt în conflict">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Schimbările vor putea fi vizualizate doar într-o fereastră nouă">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Servere proxy">
diff --git a/chrome/locale/ro-RO/zotero/standalone.dtd b/chrome/locale/ro-RO/zotero/standalone.dtd
index 91c838919..705441fe4 100644
--- a/chrome/locale/ro-RO/zotero/standalone.dtd
+++ b/chrome/locale/ro-RO/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Selectează tot">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opțiuni…">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Preferințe">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties
index 56aab53e2..1ea4488e1 100644
--- a/chrome/locale/ro-RO/zotero/zotero.properties
+++ b/chrome/locale/ro-RO/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Administrează motoarele de căutare de informații..
 standalone.corruptInstallation=Instalarea ta a programului Zotero Standalone pare a fi coruptă datorită unei erori de autoactualizare. Chiar dacă Zotero ar putea funcționa, pentru a evida potențialele erori, te rog să descarci ultima versiune a programului Zotero Standalone de la  http://zotero.org/support/standalone cât mai curând posibil.
 standalone.addonInstallationFailed.title=Instalarea extensiei a eșuat
 standalone.addonInstallationFailed.body=Extensia "%S" nu a putut fi instalată. Poate că este incompatibilă cu această versiune a programului Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Eroare la conectorul Zotero
 connector.standaloneOpen=Baza ta de date nu poate fi accesată fiindcă Zotero Standalone este deschis. Te rog să-ți vizualizezi înregistrările în Zotero Standalone.
diff --git a/chrome/locale/ru-RU/zotero/preferences.dtd b/chrome/locale/ru-RU/zotero/preferences.dtd
index 050ba7a48..dfa236994 100644
--- a/chrome/locale/ru-RU/zotero/preferences.dtd
+++ b/chrome/locale/ru-RU/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Размер шрифта заметок:">
 
 <!ENTITY zotero.preferences.miscellaneous "Разное">
-<!ENTITY zotero.preferences.autoUpdate "Автоматически проверять на наличие обновленных трансляторов">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Обновить сейчас">
 <!ENTITY zotero.preferences.reportTranslationFailure "Сообщить о неработающих трансляторах сайта">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Разрешить zotero.org модифицировать содержание на основе текущей версии Zotero">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Горячие клавиши">
 
 <!ENTITY zotero.preferences.keys.openZotero "Открыть/закрыть панель Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Переключение полноэкранного режима">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Фокус на панели библиотек">
 <!ENTITY zotero.preferences.keys.quicksearch "Быстрый поиск">
-<!ENTITY zotero.preferences.keys.newItem "Создать новый документ">
-<!ENTITY zotero.preferences.keys.newNote "Создать новую заметку">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Переключить панель выбора тэгов">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Скопировать цитаты из выбранного документа в буфер обмена">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Копировать выбранные документы в буфер обмена">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Импортировать из буфера обмена">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Попытаться переопределить конфликтующие комбинации клавиш">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Изменения вступят в силу только в новых окнах">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Прокси">
diff --git a/chrome/locale/ru-RU/zotero/standalone.dtd b/chrome/locale/ru-RU/zotero/standalone.dtd
index 0f7a28884..5147d1e4f 100644
--- a/chrome/locale/ru-RU/zotero/standalone.dtd
+++ b/chrome/locale/ru-RU/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Выбрать все">
 <!ENTITY selectAllCmd.key "А">
 <!ENTITY selectAllCmd.accesskey "А">
-<!ENTITY preferencesCmd.label "Параметры...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Настройки">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties
index 607754e93..e08ca79ab 100644
--- a/chrome/locale/ru-RU/zotero/zotero.properties
+++ b/chrome/locale/ru-RU/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Диспетчер систем поиска…
 standalone.corruptInstallation=Установленное Автономное Zotero вероятно было повреждено в результате неудавшегося авто-обновления. Хотя Zotero может продолжать работать, чтобы избежать потенциальных проблем, пожалуйста, как можно скорее загрузите последнюю версию Автономного Zotero c http://zotero.org/support/standalone.
 standalone.addonInstallationFailed.title=Не получилось установить дополнение
 standalone.addonInstallationFailed.body=Дополнение "%S" не может быть установлено. Вероятно оно несовместимо с этой версией Zotero.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Ошибка соединения Zotero
 connector.standaloneOpen=Ваша база данных недоступна, поскольку открыто Автономное Zotero. Пожалуйста, посмотрите ваши документы в Автономном Zotero.
diff --git a/chrome/locale/sk-SK/zotero/preferences.dtd b/chrome/locale/sk-SK/zotero/preferences.dtd
index f7e354da8..bc9880e3b 100644
--- a/chrome/locale/sk-SK/zotero/preferences.dtd
+++ b/chrome/locale/sk-SK/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Veľkosť písma v poznámkach:">
 
 <!ENTITY zotero.preferences.miscellaneous "Rôzne">
-<!ENTITY zotero.preferences.autoUpdate "automaticky kontrolovať aktualizácie konvertorov">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Aktualizovať teraz">
 <!ENTITY zotero.preferences.reportTranslationFailure "hlásiť chybné konvertory">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "povoliť stránke zotero.org, aby prispôsobovala svoj obsah podľa aktuálnej verzie Zotera">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Klávesové skratky">
 
 <!ENTITY zotero.preferences.keys.openZotero "Otvoriť/zatvoriť Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Prepnúť Zotero do celého okna">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Tabla knižníc Focus">
 <!ENTITY zotero.preferences.keys.quicksearch "Rýchle vyhľadávanie">
-<!ENTITY zotero.preferences.keys.newItem "Vytvoriť novú položku">
-<!ENTITY zotero.preferences.keys.newNote "Vytvoriť novú poznámku">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Zobraziť/skryť značky">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopírovať vybrané citácie do schránky">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopírovať vybrané položky do schránky">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importovať zo schránky">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Pokúsiť sa získať kontrolu v prípade konfliktu skratiek s inými rozšíreniami.">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Zmeny sa prejavia iba v novo otvorených oknách.">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxy">
diff --git a/chrome/locale/sk-SK/zotero/standalone.dtd b/chrome/locale/sk-SK/zotero/standalone.dtd
index e03bab08b..f9cf0d157 100644
--- a/chrome/locale/sk-SK/zotero/standalone.dtd
+++ b/chrome/locale/sk-SK/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Vybrať všetko">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Možnosti...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Nastavenia">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties
index 33a0b90e8..ae4a991e4 100644
--- a/chrome/locale/sk-SK/zotero/zotero.properties
+++ b/chrome/locale/sk-SK/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Spravovať vyhľadávacie motory...
 standalone.corruptInstallation=Inštalácia vášho Samostatného Zotera je zrejme porušená kvôli nezdarenej automatickej aktualizácii. Aj keď Zotero môže naďalej fungovať, vyhnite sa radšej možným poruchám a stiahnite si prosím čím skôr najnovšiu verziu Samostatného Zotera zo stránky http://zotero.org/support/standalone.
 standalone.addonInstallationFailed.title=Inštalácia doplnku zlyhala
 standalone.addonInstallationFailed.body=Doplnok "%S" sa nedá nainštalovať. Pravdepodobne nie je kompatibilný s terajšou verziou Samostatného Zotera.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Chyba spojovníka s Zoterom
 connector.standaloneOpen=Nedá sa vojsť do vašej databázy, pretože Samostatné Zotero je práve otvorené. Prezrite si vaše položky prosím v Samostatnom Zotere.
diff --git a/chrome/locale/sl-SI/zotero/preferences.dtd b/chrome/locale/sl-SI/zotero/preferences.dtd
index 3bf1d50f2..ef2fb013b 100644
--- a/chrome/locale/sl-SI/zotero/preferences.dtd
+++ b/chrome/locale/sl-SI/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Velikost pisave opomb:">
 
 <!ENTITY zotero.preferences.miscellaneous "Razno">
-<!ENTITY zotero.preferences.autoUpdate "Samodejno preveri posodobitve prevajalnikov">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Posodobi zdaj">
 <!ENTITY zotero.preferences.reportTranslationFailure "Sporoči okvarjene prevajalnike mest">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Dovoli zotero.org prilagoditi vsebino glede na trenutno različico Zotera">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Tipke za bližnjice">
 
 <!ENTITY zotero.preferences.keys.openZotero "Odpri/zapri podokno Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Vključi/izključi celozaslonski način">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Pozornost na podokno knjižnic">
 <!ENTITY zotero.preferences.keys.quicksearch "Hitro iskanje">
-<!ENTITY zotero.preferences.keys.newItem "Ustvari nov vnos">
-<!ENTITY zotero.preferences.keys.newNote "Ustvari novo opombo">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Vključi/izključi izbirnik značk">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopiraj citate izbranega elementa na odložišče">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopiraj izbrane elemente na odložišče">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Uvozi z odložišča">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Poskusi preglasiti sporne tipke za bližnjice">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Spremembe veljajo le v novih oknih">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Posredovalni strežniki">
diff --git a/chrome/locale/sl-SI/zotero/standalone.dtd b/chrome/locale/sl-SI/zotero/standalone.dtd
index d3264a184..c8c16a50f 100644
--- a/chrome/locale/sl-SI/zotero/standalone.dtd
+++ b/chrome/locale/sl-SI/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Izberi vse">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "z">
-<!ENTITY preferencesCmd.label "Možnosti ...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "M">
 <!ENTITY preferencesCmdUnix.label "Nastavitve">
 <!ENTITY preferencesCmdUnix.accesskey "N">
diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties
index a45c0c579..60688327a 100644
--- a/chrome/locale/sl-SI/zotero/zotero.properties
+++ b/chrome/locale/sl-SI/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Upravljaja s pogoni iskanja ...
 standalone.corruptInstallation=Vaša namestitev samostojnega Zotero Standalone je najbrž okvarjena zaradi neuspele samodejne posodobitve. Čeprav bo morda Zotero še naprej deloval, v izogib morebitnim težavam čim prej prenesite najnovejšo različico samostojnega Zotero Standalone z naslova http://zotero.org/support/standalone.
 standalone.addonInstallationFailed.title=Namestitev dodatka ni uspela
 standalone.addonInstallationFailed.body=Dodatka »%S« ni mogoče namestiti. Morda je nezdružljiv s to različico Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Napaka povezave Zotero
 connector.standaloneOpen=Dostop do vaše zbirke podatkov ni možen, ker je trenutno odprt Zotero Standalone. Predmete si zato oglejte v njem.
diff --git a/chrome/locale/sr-RS/zotero/preferences.dtd b/chrome/locale/sr-RS/zotero/preferences.dtd
index 81336e64c..a1ccc2b66 100644
--- a/chrome/locale/sr-RS/zotero/preferences.dtd
+++ b/chrome/locale/sr-RS/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Величина фонта:">
 
 <!ENTITY zotero.preferences.miscellaneous "Разне поставке">
-<!ENTITY zotero.preferences.autoUpdate "Самостално провери ажуриране преводиоце">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Ажурирај сада">
 <!ENTITY zotero.preferences.reportTranslationFailure "Извести о грешкама у „преводиоцу странице“">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Allow zotero.org to customize content based on current Zotero version">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Пречице на тастатури">
 
 <!ENTITY zotero.preferences.keys.openZotero "Отвори/затвори Зотеро површ">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Укључи/искључи приказ преко целог екрана">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Брза претрага">
-<!ENTITY zotero.preferences.keys.newItem "Направи нову ставку">
-<!ENTITY zotero.preferences.keys.newNote "Направи нову белешку">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Искључи/укључи избирача ознаке">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Умножи изабрани предмет цитата у списак исечака">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Умножи изабране ставке у списак исечака">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Покушај да премостиш сукобљене пречице">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Промене су постављене само у новом прозору">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties
index a07d39bae..e64899535 100644
--- a/chrome/locale/sr-RS/zotero/zotero.properties
+++ b/chrome/locale/sr-RS/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/sv-SE/zotero/preferences.dtd b/chrome/locale/sv-SE/zotero/preferences.dtd
index 7443a057c..1e9c9fd5a 100644
--- a/chrome/locale/sv-SE/zotero/preferences.dtd
+++ b/chrome/locale/sv-SE/zotero/preferences.dtd
@@ -22,14 +22,14 @@
 <!ENTITY zotero.preferences.fontSize.notes "Teckenstorlek på anteckningar">
 
 <!ENTITY zotero.preferences.miscellaneous "Övrigt">
-<!ENTITY zotero.preferences.autoUpdate "Kolla automatiskt efter nya källfångare">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Uppdatera nu">
 <!ENTITY zotero.preferences.reportTranslationFailure "Rapportera felaktiga källfångare">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Tillåt zotero.org att justera innehåll beroende på installerad Zoteroversion">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader.tooltip "Visa för zotero.org vilken version av programmet jag använder">
 <!ENTITY zotero.preferences.parseRISRefer "Använd Zotero för att ladda ner RIS/Refer-filer">
 <!ENTITY zotero.preferences.automaticSnapshots "Ta automatiskt lokala kopior när källor skapas av hemsidor">
-<!ENTITY zotero.preferences.downloadAssociatedFiles "Bifoga automatiskt associerade PDF- och andra filer när källor sparas">
+<!ENTITY zotero.preferences.downloadAssociatedFiles "Bifoga automatiskt associerade PDF:er och andra filer när källor sparas">
 <!ENTITY zotero.preferences.automaticTags "Lägg automatiskt till etiketter med nyckelord och ämnesord">
 <!ENTITY zotero.preferences.trashAutoEmptyDaysPre "Radera automatiskt källor i papperskorgen som raderats för mer än">
 <!ENTITY zotero.preferences.trashAutoEmptyDaysPost "dagar sen">
@@ -63,7 +63,7 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.download "Ladda ner filer">
 <!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "vid synkronisering">
 <!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "efter behov">
-<!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Genom att använda Zotero Storage går du med på deras">
+<!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Genom att använda Zotero Storage går du med på tjänstens">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "avtalsvillkor">
 <!ENTITY zotero.preferences.sync.reset.warning1 "Följande åtgärder är endast till för sällsynta, särskilda situationer och ska inte användas för vanlig felsökning. I många fall kan återställning istället ge upphov till nya problem. Se">
 <!ENTITY zotero.preferences.sync.reset.warning2 "Återställningsalternativ för synkronisering">
@@ -75,7 +75,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer "Återställ till Zotero Server">
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Byt ut allt innehåll på Zotero Server mot lokala Zoterodata.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Återställ filsynkroniseringshistorik">
-<!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Tvinga Zotero Server att säkerhetskontrollera alla lokala bifogade filer.">
+<!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Tvinga kontroll mot lagringsservern för alla lokala bifogade filer.">
 <!ENTITY zotero.preferences.sync.reset "Återställ">
 <!ENTITY zotero.preferences.sync.reset.button "Återställ...">
 
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Snabbkommandon">
 
 <!ENTITY zotero.preferences.keys.openZotero "Öppna/Stäng Zotero-panelen">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Växla fullskärmsläge">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Ruta för fokusbibliotek">
 <!ENTITY zotero.preferences.keys.quicksearch "Snabbsökning">
-<!ENTITY zotero.preferences.keys.newItem "Lagra en ny källa">
-<!ENTITY zotero.preferences.keys.newNote "Skapa en ny anteckning">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Växla etikettväljare">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopiera valda källanteckningar till urklipp">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopiera valda källor till urklipp">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Klistra in från urklipp">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Försök kringgå motsägelsefulla snabbkommandon">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Ändringarna gäller bara i nya fönster">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxyservrar">
diff --git a/chrome/locale/sv-SE/zotero/standalone.dtd b/chrome/locale/sv-SE/zotero/standalone.dtd
index 837d65b9e..a28163e23 100644
--- a/chrome/locale/sv-SE/zotero/standalone.dtd
+++ b/chrome/locale/sv-SE/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Markera allt">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Alternativ…">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Inställningar">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/sv-SE/zotero/timeline.properties b/chrome/locale/sv-SE/zotero/timeline.properties
index 6f752cbfe..e807259e2 100644
--- a/chrome/locale/sv-SE/zotero/timeline.properties
+++ b/chrome/locale/sv-SE/zotero/timeline.properties
@@ -1,6 +1,6 @@
 general.title=Zotero tidslinje
 general.filter=Filtrera:
-general.highlight=Framhäv
+general.highlight=Framhäv:
 general.clearAll=Radera allt
 general.jumpToYear=Hoppa till år:
 general.firstBand=Första strecket:
@@ -18,4 +18,4 @@ interval.century=Århundrade
 interval.millennium=Årtusende
 
 dateType.published=Publiceringsdatum
-dateType.modified=Senaste ändringsdatum
+dateType.modified=Ändringsdatum
diff --git a/chrome/locale/sv-SE/zotero/zotero.dtd b/chrome/locale/sv-SE/zotero/zotero.dtd
index ce658bb6e..325d6627e 100644
--- a/chrome/locale/sv-SE/zotero/zotero.dtd
+++ b/chrome/locale/sv-SE/zotero/zotero.dtd
@@ -93,7 +93,7 @@
 
 <!ENTITY zotero.toolbar.newItem.label "Ny post">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Mer">
-<!ENTITY zotero.toolbar.newItemFromPage.label "Skapa ny post från aktuell sida">
+<!ENTITY zotero.toolbar.newItemFromPage.label "Skapa ny webbsidekälla från aktuell sida">
 <!ENTITY zotero.toolbar.lookup.label "Lägg till källa via referensnummer">
 <!ENTITY zotero.toolbar.removeItem.label "Radera källa...">
 <!ENTITY zotero.toolbar.newCollection.label "Ny samling...">
@@ -209,7 +209,7 @@
 
 <!ENTITY zotero.integration.prefs.formatUsing.label "Formatera med:">
 <!ENTITY zotero.integration.prefs.bookmarks.label "Bokmärken">
-<!ENTITY zotero.integration.prefs.bookmarks.caption "Bokmärken sparas i Microsoft Word och OpenOffice, men kan ändras av misstag.">
+<!ENTITY zotero.integration.prefs.bookmarks.caption "Bokmärken sparas i Microsoft Word och LibreOffice, men kan ändras av misstag. Av kompatibilitetsskäl kan inte källhänvisningar läggas till fotnoter eller slutkommentarer när detta alternativ är valt.">
 
 
 <!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Förkorta tidskriftstitlar automatiskt">
diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties
index 173a1d8cd..eb93c0855 100644
--- a/chrome/locale/sv-SE/zotero/zotero.properties
+++ b/chrome/locale/sv-SE/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Hantera söktjänster...
 standalone.corruptInstallation=Din Zotero Standalone-installation tycks vara trasig på grund av en misslyckad automatisk uppdatering. Även om Zotero kan köras bör du så snart som möjligt ladda hem den senaste versionen av Zotero Standalone från http://zotero.org/support/standalone .
 standalone.addonInstallationFailed.title=Installation av tillägg misslyckades
 standalone.addonInstallationFailed.body=Tillägget "%S" installerades inte. Det kanske inte fungerar med denna version av Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector-fel
 connector.standaloneOpen=Din databas kan inte nås eftersom Zotero Standalone är aktivt. Använd Zotero Standalone för att se dina källor.
diff --git a/chrome/locale/th-TH/zotero/preferences.dtd b/chrome/locale/th-TH/zotero/preferences.dtd
index 62c89a816..93cdb8309 100644
--- a/chrome/locale/th-TH/zotero/preferences.dtd
+++ b/chrome/locale/th-TH/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "ขนาดตัวอักษรในหมายเหตุ:">
 
 <!ENTITY zotero.preferences.miscellaneous "อื่น ๆ">
-<!ENTITY zotero.preferences.autoUpdate "ตรวจสอบการอัพเดตตัวช่วยแปลเว็บไซต์โดยอัตโนมัติ">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "อัพเดตเดี๋ยวนี้">
 <!ENTITY zotero.preferences.reportTranslationFailure "รายงานตัวช่วยแปลเว็บไซต์ใช้งานไม่ได้">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "ยินยอมให้ zotero.org ปรับปรุงข้อมูลตามรุ่นปัจจุบันของ Zotero">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "คีย์ลัด">
 
 <!ENTITY zotero.preferences.keys.openZotero "เปิด/ปิดแผง Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "เปลี่ยนสู่แบบเต็มจอ">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "โฟกัสที่ช่องไลบรารี">
 <!ENTITY zotero.preferences.keys.quicksearch "ค้นหาแบบเร็ว">
-<!ENTITY zotero.preferences.keys.newItem "สร้างรายการใหม่">
-<!ENTITY zotero.preferences.keys.newNote "สร้างหมายเหตุใหม่">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "เปลี่ยนตัวเลือกแท็ก">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "ทำสำเนารายการอ้างอิงที่เลือกไว้ไปยังคลิปบอร์ด">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "ทำสำเนารายการที่เลือกไปยังคลิปบอร์ด">
 <!ENTITY zotero.preferences.keys.importFromClipboard "นำเข้าจากคลิปบอร์ด">
-<!ENTITY zotero.preferences.keys.overrideGlobal "พยายามครอบงำคีย์ลัดที่ขัดแย้งกัน">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "การเปลี่ยนแปลงจะมีผลกับหน้าต่างใหม่เท่านั้น">
 
 <!ENTITY zotero.preferences.prefpane.proxies "พร็อกซี่">
diff --git a/chrome/locale/th-TH/zotero/standalone.dtd b/chrome/locale/th-TH/zotero/standalone.dtd
index 3dd5f3a7a..8e17fb477 100644
--- a/chrome/locale/th-TH/zotero/standalone.dtd
+++ b/chrome/locale/th-TH/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "เลือกทั้งหมด">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "ตัวเลือก...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "ตั้งค่าพึงใจ">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties
index 92014135a..d531f8553 100644
--- a/chrome/locale/th-TH/zotero/zotero.properties
+++ b/chrome/locale/th-TH/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=จัดการเครื่องประม
 standalone.corruptInstallation=การติดตั้ง Zotero แบบสแตนด์อะโลนของคุณเกิดการวิบัติเนื่องจากการปรับรุ่นแบบอัตโนมัติล้มเหลว ระหว่างที่ Zotero อาจทำงานต่อเนื่อง เพื่อหลีกเลี่ยงจุดบกพร่อง กรุณาดาวน์โหลด Zotero แบบสแตนด์อะโลนรุ่นล่าสุดจาก http://zotero.org/support/standalone โดยเร็วที่สุด
 standalone.addonInstallationFailed.title=ติดตั้งโปรแกรมเสริมล้มเหลว
 standalone.addonInstallationFailed.body=โปรแกรมเสริม "%S" ยังไม่ได้ติดตั้ง ซึ่งอาจเข้ากันไม่ได้กับรุ่นของ Zotero สแตนด์อะโลน
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=ตัวเชื่อมต่อ Zotero ผิดพลาด
 connector.standaloneOpen=ฐานข้อมูลของคุณไม่สามารถเข้าถึงได้ เพราะ Zotero แบบสแตนด์อะโลนกำลังเปิดใช้อยู่ โปรดดูรายการของคุณใน Zotero แบบสแตนด์อะโลน
diff --git a/chrome/locale/tr-TR/zotero/preferences.dtd b/chrome/locale/tr-TR/zotero/preferences.dtd
index a1d786477..78bb10445 100644
--- a/chrome/locale/tr-TR/zotero/preferences.dtd
+++ b/chrome/locale/tr-TR/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Not yazıtipi boyutu:">
 
 <!ENTITY zotero.preferences.miscellaneous "Çeşitli">
-<!ENTITY zotero.preferences.autoUpdate "Güncel çevirmenler için otomatik kontrol yap">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Şimdi Güncelle">
 <!ENTITY zotero.preferences.reportTranslationFailure "Bozuk site çevirilerini raporla">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Zotero.org'a, kullanılan Zotero sürümüne göre içeriği özelleştirme yetkisi ver.">
@@ -60,9 +60,9 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Kitaplığımda kullanılan ekli dosyaları eşle">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Zotero deposunu kullanan kütüphane gruplarının ekli dosyalarını eşle">
-<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
-<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
-<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Dosyaları indir">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "Eşleştirme anı">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "Gerek duyulduğunda">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Zotero depolamayı kullanarak bunları kabul edersiniz:">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "Şartlar ve Koşullar">
 <!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
@@ -76,7 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Sunucudaki tüm verileri sil ve yerel Zotero verisini üzerine yaz.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Dosya Eşleme Geçmişini Sıfırla">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Tüm yerel eklenti dosyalar için depolama sunucusunun kontrolünü zorla.">
-<!ENTITY zotero.preferences.sync.reset "Reset">
+<!ENTITY zotero.preferences.sync.reset "Sıfırla">
 <!ENTITY zotero.preferences.sync.reset.button "Sıfırla...">
 
 
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Kısayol Tuşları">
 
 <!ENTITY zotero.preferences.keys.openZotero "Zotero Bölmesini Aç/Kapa">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Tam Ekran Moduna Geç">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Derme Bölmesine Odaklan">
 <!ENTITY zotero.preferences.keys.quicksearch "Çabuk Arama">
-<!ENTITY zotero.preferences.keys.newItem "Yeni eser oluştur">
-<!ENTITY zotero.preferences.keys.newNote "Yeni not oluştur">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Konu Seçiciyi Aç">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Seçili Eserin Göndermelerini Pano'ya Kopyala">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Seçilen eserleri panoya kopyala">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Panodan içeri aktar">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Çelişen kısayolların üzerine yazdırmayı dene">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Değişiklikler yeni açılan pencerelerde etkili olacaktır.">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Vekil Sunucular">
diff --git a/chrome/locale/tr-TR/zotero/standalone.dtd b/chrome/locale/tr-TR/zotero/standalone.dtd
index 362d3c915..512f4397f 100644
--- a/chrome/locale/tr-TR/zotero/standalone.dtd
+++ b/chrome/locale/tr-TR/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Tümünü Seç">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Seçenekler...">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Tercihler">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/tr-TR/zotero/zotero.dtd b/chrome/locale/tr-TR/zotero/zotero.dtd
index 54220214a..e197cb77a 100644
--- a/chrome/locale/tr-TR/zotero/zotero.dtd
+++ b/chrome/locale/tr-TR/zotero/zotero.dtd
@@ -5,7 +5,7 @@
 <!ENTITY zotero.general.edit "Düzenle">
 <!ENTITY zotero.general.delete "Sil">
 
-<!ENTITY zotero.errorReport.title "Zotero Error Report">
+<!ENTITY zotero.errorReport.title "Zotero Hata Raporu">
 <!ENTITY zotero.errorReport.unrelatedMessages "Hata kaydı Zotero ile ilgili olmayan iletileri de içerebilir.">
 <!ENTITY zotero.errorReport.submissionInProgress "Lütfen hata raporu gönderilene kadar bekleyiniz.">
 <!ENTITY zotero.errorReport.submitted "Hata raporu gönderilmiştir.">
@@ -58,17 +58,17 @@
 <!ENTITY zotero.items.rights_column "Telif">
 <!ENTITY zotero.items.dateAdded_column "Eklendiği Tarih">
 <!ENTITY zotero.items.dateModified_column "Değiştirildiği Tarih">
-<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.extra_column "İlave">
 <!ENTITY zotero.items.archive_column "Arşiv">
-<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
-<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.archiveLocation_column "Arşivdeki Yeri">
+<!ENTITY zotero.items.place_column "Yayın Yeri">
 <!ENTITY zotero.items.volume_column "Cilt">
 <!ENTITY zotero.items.edition_column "Baskı">
 <!ENTITY zotero.items.pages_column "Sayfalar">
 <!ENTITY zotero.items.issue_column "Sayı">
 <!ENTITY zotero.items.series_column "Seriler">
 <!ENTITY zotero.items.seriesTitle_column "Seri Başlığı">
-<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.court_column "Mahkeme">
 <!ENTITY zotero.items.medium_column "Medium/Format">
 <!ENTITY zotero.items.genre_column "Tür">
 <!ENTITY zotero.items.system_column "Sistem">
@@ -139,7 +139,7 @@
 <!ENTITY zotero.tagSelector.selectVisible "Görülebileni Seç">
 <!ENTITY zotero.tagSelector.clearVisible "Gürülebileni Seçme">
 <!ENTITY zotero.tagSelector.clearAll "Hiçbirini Seçme">
-<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
+<!ENTITY zotero.tagSelector.assignColor "Renk Belirle...">
 <!ENTITY zotero.tagSelector.renameTag "Etiketi Yeniden Adlandır...">
 <!ENTITY zotero.tagSelector.deleteTag "Etiketi Sil...">
 
@@ -147,7 +147,7 @@
 <!ENTITY zotero.tagColorChooser.color "Renk">
 <!ENTITY zotero.tagColorChooser.position "Position:">
 <!ENTITY zotero.tagColorChooser.setColor "Set Color">
-<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Rengi Kaldır">
 
 <!ENTITY zotero.lookup.description "ISBN, DOI veya PMID numarasını girerek aşağıdaki kutuda ara.">
 <!ENTITY zotero.lookup.button.search "Ara">
@@ -212,7 +212,7 @@
 <!ENTITY zotero.integration.prefs.bookmarks.caption "Yer imleri Microsoft Word ve OpenOffice arasında korunmuştur, ancak yanlışlıkla değiştirilebilirler. &#xA;Uyumluluk için, bu seçenek seçildiğinde, göndermeler dipnot ve sonnotlara eklenemez.">
 
 
-<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles">
+<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Dergi başlıklarını otomatik kısalt">
 <!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored.">
 
 <!ENTITY zotero.integration.prefs.storeReferences.label "Kaynakları belgede göster">
diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties
index c10150156..310b2143a 100644
--- a/chrome/locale/tr-TR/zotero/zotero.properties
+++ b/chrome/locale/tr-TR/zotero/zotero.properties
@@ -11,7 +11,7 @@ general.restartRequiredForChange=Değişikliğin etkili olabilmesi için %S yeni
 general.restartRequiredForChanges=Değişikliklerin etkili olabilmesi için %S yeniden başlatılmalıdır.
 general.restartNow=Şimdi yeniden başlat
 general.restartLater=Sonra yeniden başlat.
-general.restartApp=Restart %S
+general.restartApp=Yeniden başlat %S
 general.quitApp=Quit %S
 general.errorHasOccurred=Bir hata meydana geldi.
 general.unknownErrorOccurred=Bilinmeyen bir hata oluştu.
@@ -41,13 +41,13 @@ general.seeForMoreInformation=Daha fazla bilgi için bakınız: %S
 general.enable=Seçilir Kıl:
 general.disable=Seçilemez Kıl
 general.remove=Kaldır
-general.reset=Reset
+general.reset=Sıfırla
 general.hide=Sakla
 general.quit=Quit
-general.useDefault=Use Default
+general.useDefault=Varsayılanı Kullan
 general.openDocumentation=Bilgilemeyi Aç
 general.numMore=%S more…
-general.openPreferences=Open Preferences
+general.openPreferences=Tercihleri Aç
 
 general.operationInProgress=Zotero işlemi çalışıyor.
 general.operationInProgress.waitUntilFinished=Lütfen bitene kadar bekleyiniz.
@@ -102,7 +102,7 @@ dataDir.useProfileDir=Firefox profil dizinini kullan
 dataDir.selectDir=Zotero veri dizini seç
 dataDir.selectedDirNonEmpty.title=Dizin Boş Değil
 dataDir.selectedDirNonEmpty.text=Seçtiğiniz dizin boş değil ve Zotero veri dizini olarak görülmüyor.\n\nHerşeye rağmen bu dizinde Zotero dosyalarını oluşturmak istermisiniz?
-dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.title=Dizin Boş
 dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually move files from the existing data directory to the new location after %1$S has closed.
 dataDir.selectedDirEmpty.useNewDir=Use the new directory?
 dataDir.moveFilesToNewLocation=Be sure to move files from your existing Zotero data directory to the new location before reopening %1$S.
@@ -633,7 +633,7 @@ fulltext.indexState.partial=Bölümsel
 
 exportOptions.exportNotes=Notları Dışarı Aktar
 exportOptions.exportFileData=Dosyaları Dışarı Aktar
-exportOptions.useJournalAbbreviation=Use Journal Abbreviation
+exportOptions.useJournalAbbreviation=Dergi Kısaltması Kullan
 charset.UTF8withoutBOM=Unicode (BOM'suz UTF-8)
 charset.autoDetect=(otomatik algıla)
 
@@ -649,8 +649,8 @@ citation.multipleSources=Çoklu Kaynaklar...
 citation.singleSource=Tek Kaynak...
 citation.showEditor=Editörü Göster...
 citation.hideEditor=Editörü Gizle...
-citation.citations=Citations
-citation.notes=Notes
+citation.citations=Alıntılar
+citation.notes=Notlar
 
 report.title.default=Zotero Rapor
 report.parentItem=Üst Eser:
@@ -736,7 +736,7 @@ styles.abbreviations.title=Load Abbreviations
 styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
 styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
 
-sync.sync=Sync
+sync.sync=Eşle
 sync.cancel=Eşlemeyi İptal Et
 sync.openSyncPreferences=Eşleme Tercihlerini Aç...
 sync.resetGroupAndSync=Grubu Sıfırla ve Eşle
@@ -764,7 +764,7 @@ sync.error.copyChangedItems=Eğer değişiklikleri başka bir yere kopyalamak ve
 sync.error.manualInterventionRequired=Otomatik eşleme bir çelişki ile sonuçlandı bu elle müdahaleyi gerektiriyor.
 sync.error.clickSyncIcon=Elle eşleme için eşleme simgesine tıklayın.
 sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
-sync.error.sslConnectionError=SSL connection error
+sync.error.sslConnectionError=SSL bağlantı hatası
 sync.error.checkConnection=Error connecting to server. Check your Internet connection.
 sync.error.emptyResponseServer=Empty response from server.
 sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Tek Başına Zotero kurulumunuz başarısız bir otomatik güncelleme nedeni ile bozulmuş gözüküyor. Zotero çalışmaya devam edebilse de, olabilecek hataları önleyebilmek için, lütfen Tek Başına Zotero'nun en yeni sürümünü en kısa zamanda http://zotero.org/support/standalone adresinden indiriniz.
 standalone.addonInstallationFailed.title=Eklenti Kurulması Başarısızlıkla Sonuçlandı
 standalone.addonInstallationFailed.body=Bu eklenti, "%S", kurulamadı. Tek Başına Zotero'nun bu sürümü ile uyumsuz olabilir.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Bağlayıcısı Hatası
 connector.standaloneOpen=Tek Başına Zotero şu an açık olduğundan, veritabanınıza ulaşılamıyor. Eserlere lütfen Tek Başına Zotero'da bakınız.
diff --git a/chrome/locale/vi-VN/zotero/preferences.dtd b/chrome/locale/vi-VN/zotero/preferences.dtd
index 5d99aa203..3dba38dab 100644
--- a/chrome/locale/vi-VN/zotero/preferences.dtd
+++ b/chrome/locale/vi-VN/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "Note font size:">
 
 <!ENTITY zotero.preferences.miscellaneous "Các tùy chọn khác">
-<!ENTITY zotero.preferences.autoUpdate "Tự động tìm kiếm các bản cập nhật cho các bộ biến đổi">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "Cập nhật ngay bây giờ">
 <!ENTITY zotero.preferences.reportTranslationFailure "Báo cáo các bộ biến đổi bị hỏng">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Allow zotero.org to customize content based on current Zotero version">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "Phím gõ tắt">
 
 <!ENTITY zotero.preferences.keys.openZotero "Mở/Đóng cửa sổ Zotero">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Bật/Tắt chế độ Toàn-màn-hình">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Tìm kiếm nhanh">
-<!ENTITY zotero.preferences.keys.newItem "Tạo một biểu ghi mới">
-<!ENTITY zotero.preferences.keys.newNote "Tạo một ghi chép mới">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Bật/Tắt Bộ-chọn-thẻ">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Sao chép các trích dẫn vừa chọn vào clipboard">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Sao chép các biểu ghi vừa chọn vào clipboard">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard">
-<!ENTITY zotero.preferences.keys.overrideGlobal "Thử ghi đè các phím gõ tắt có xung đột">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "Các thay đổi chỉ có hiệu lực trong các cửa sổ mới">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Proxies">
diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties
index b2290260a..425da22a3 100644
--- a/chrome/locale/vi-VN/zotero/zotero.properties
+++ b/chrome/locale/vi-VN/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
 standalone.addonInstallationFailed.title=Add-on Installation Failed
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
diff --git a/chrome/locale/zh-CN/zotero/preferences.dtd b/chrome/locale/zh-CN/zotero/preferences.dtd
index 2e5d3df17..58d4d7f39 100644
--- a/chrome/locale/zh-CN/zotero/preferences.dtd
+++ b/chrome/locale/zh-CN/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "笔记字体大小:">
 
 <!ENTITY zotero.preferences.miscellaneous "杂项">
-<!ENTITY zotero.preferences.autoUpdate "自动更新转换器">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "立刻更新">
 <!ENTITY zotero.preferences.reportTranslationFailure "报告失效的网站转换器">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "允许 zotero.org 根据当前 Zotero 版本定制内容">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "快捷键">
 
 <!ENTITY zotero.preferences.keys.openZotero "开/关 Zotero 面板">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "切换全屏模式">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "聚焦文献库面板">
 <!ENTITY zotero.preferences.keys.quicksearch "快速搜索">
-<!ENTITY zotero.preferences.keys.newItem "新建条目">
-<!ENTITY zotero.preferences.keys.newNote "新建笔记">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "切换标签选择器">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "复制选定条目的引文到剪贴板">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "复制选定的条目到剪贴板">
 <!ENTITY zotero.preferences.keys.importFromClipboard "从剪贴板导入">
-<!ENTITY zotero.preferences.keys.overrideGlobal "尝试覆盖有冲突的快捷键">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "更改仅在新开的窗口中生效">
 
 <!ENTITY zotero.preferences.prefpane.proxies "代理">
diff --git a/chrome/locale/zh-CN/zotero/standalone.dtd b/chrome/locale/zh-CN/zotero/standalone.dtd
index 2c6317b22..212205fba 100644
--- a/chrome/locale/zh-CN/zotero/standalone.dtd
+++ b/chrome/locale/zh-CN/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "全选">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "选项…">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "首选项">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties
index c6ee4b8ff..6b5d3ba1e 100644
--- a/chrome/locale/zh-CN/zotero/zotero.properties
+++ b/chrome/locale/zh-CN/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=管理检索引擎...
 standalone.corruptInstallation=由于自动更新失败, Zotero 独立版安装已经损坏. Zotero可能仍然可以运行, 不过为了避免可能的问题, 请尽快从 http://zotero.org/support/standalone 上下载最新的版本.
 standalone.addonInstallationFailed.title=插件安装失败
 standalone.addonInstallationFailed.body="%S"插件无法安装, 它可能与此版本的 Zotero 独立版不兼容.
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero连接器错误
 connector.standaloneOpen=由于 Zotero 独立版正在运行, 您无法对数据库进行操作. 请在Zotero 独立版中浏览您的条目.
diff --git a/chrome/locale/zh-TW/zotero/preferences.dtd b/chrome/locale/zh-TW/zotero/preferences.dtd
index b8c108d6d..4d947b522 100644
--- a/chrome/locale/zh-TW/zotero/preferences.dtd
+++ b/chrome/locale/zh-TW/zotero/preferences.dtd
@@ -22,7 +22,7 @@
 <!ENTITY zotero.preferences.fontSize.notes "筆記字型大小：">
 
 <!ENTITY zotero.preferences.miscellaneous "雜項">
-<!ENTITY zotero.preferences.autoUpdate "自動檢查更新的轉譯器">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
 <!ENTITY zotero.preferences.updateNow "立刻更新">
 <!ENTITY zotero.preferences.reportTranslationFailure "回報故障的網站轉譯器">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "允許 zotero.org 依目前的 Zotero 版本來調整內容。">
@@ -126,16 +126,16 @@
 <!ENTITY zotero.preferences.prefpane.keys "快速鍵">
 
 <!ENTITY zotero.preferences.keys.openZotero "開／關 Zotero 窗格">
+<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "切換全螢幕模式">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "聚焦到書庫窗格">
 <!ENTITY zotero.preferences.keys.quicksearch "快速搜尋">
-<!ENTITY zotero.preferences.keys.newItem "建立一個新的項目">
-<!ENTITY zotero.preferences.keys.newNote "建立一則新的筆記">
+<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
+<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "切換標籤選擇器">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "複製選取項目的引用文獻到剪貼簿">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "複製選取項目到剪貼簿">
 <!ENTITY zotero.preferences.keys.importFromClipboard "從剪貼簿匯入">
-<!ENTITY zotero.preferences.keys.overrideGlobal "嘗試蓋過相衝突的快速鍵">
 <!ENTITY zotero.preferences.keys.changesTakeEffect "改變只會在新開的視窗中生效">
 
 <!ENTITY zotero.preferences.prefpane.proxies "代理伺服器">
diff --git a/chrome/locale/zh-TW/zotero/standalone.dtd b/chrome/locale/zh-TW/zotero/standalone.dtd
index 8074515c8..278e404db 100644
--- a/chrome/locale/zh-TW/zotero/standalone.dtd
+++ b/chrome/locale/zh-TW/zotero/standalone.dtd
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "全選">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "選項…">
+<!ENTITY preferencesCmd.label "Preferences">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "偏好設定">
 <!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties
index ca311fb31..90c15554d 100644
--- a/chrome/locale/zh-TW/zotero/zotero.properties
+++ b/chrome/locale/zh-TW/zotero/zotero.properties
@@ -934,6 +934,10 @@ locate.manageLocateEngines=Manage Lookup Engines...
 standalone.corruptInstallation=您的 Zotero 獨立版安裝看來因自動更新失敗而有毀損。雖然 Zotero 可能仍可以運作，要避免可能潛在的問題，請儘快自 http://zotero.org/support/standalone 下載最新版 Zotero 獨立版。
 standalone.addonInstallationFailed.title=擴充套件安裝失敗
 standalone.addonInstallationFailed.body=無法安裝擴充套件 "%S"。可能是因為不相容於目前的 Zotero 獨立版版本。
+standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
+standalone.rootWarning.exit=Exit
+standalone.rootWarning.continue=Continue
+standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
 connector.error.title=Zotero 資料庫連結器錯誤
 connector.standaloneOpen=無法存取您的資料庫，因為 Zotero 獨立版目前是開啟的。請於 Zotero 獨立版檢視您的項目。

From 5b09b1e2bec2c18844e61752333a783bb4bb6b0a Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 6 Aug 2013 15:23:04 -0400
Subject: [PATCH 06/20] Update submodules, repotime, and versions

---
 chrome/content/zotero/xpcom/zotero.js | 2 +-
 install.rdf                           | 2 +-
 resource/schema/repotime.txt          | 2 +-
 styles                                | 2 +-
 translators                           | 2 +-
 update.rdf                            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 450e1c13e..d8be90daf 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -39,7 +39,7 @@ const ZOTERO_CONFIG = {
 	BOOKMARKLET_ORIGIN : 'https://www.zotero.org',
 	HTTP_BOOKMARKLET_ORIGIN : 'http://www.zotero.org',
 	BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/',
-	VERSION: "4.0.8.SOURCE"
+	VERSION: "4.0.10.SOURCE"
 };
 
 // Commonly used imports accessible anywhere
diff --git a/install.rdf b/install.rdf
index 42656216e..74350e697 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
   
     <em:id>zotero@chnm.gmu.edu</em:id>
     <em:name>Zotero</em:name>
-    <em:version>4.0.9.SOURCE</em:version>
+    <em:version>4.0.10.SOURCE</em:version>
     <em:creator>Center for History and New Media<br/>George Mason University</em:creator>
     <em:contributor>Dan Cohen</em:contributor>
     <em:contributor>Sean Takats</em:contributor>
diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt
index 1b610cc67..21d52fef6 100644
--- a/resource/schema/repotime.txt
+++ b/resource/schema/repotime.txt
@@ -1 +1 @@
-2013-07-22 02:55:00
+2013-08-06 03:30:00
diff --git a/styles b/styles
index c536a2c5c..d7eaec6c1 160000
--- a/styles
+++ b/styles
@@ -1 +1 @@
-Subproject commit c536a2c5c28ca465b511733a849ae452822fd363
+Subproject commit d7eaec6c1e691b661facc0b4db491a1052c3bf1a
diff --git a/translators b/translators
index 10e7c43ed..330bcfa0a 160000
--- a/translators
+++ b/translators
@@ -1 +1 @@
-Subproject commit 10e7c43ed0e70cdccebf575d4cdccd81b8914ffe
+Subproject commit 330bcfa0ab1c501b71d82d56b1cad88523cea722
diff --git a/update.rdf b/update.rdf
index d7c271be7..e761ab111 100644
--- a/update.rdf
+++ b/update.rdf
@@ -7,7 +7,7 @@
     <RDF:Seq>
       <RDF:li>
         <RDF:Description>
-          <version>4.0.9.SOURCE</version>
+          <version>4.0.10.SOURCE</version>
           <targetApplication>
             <RDF:Description>
               <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>

From 795211fb403263547b046a14298c03eb55f3bf21 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 6 Aug 2013 15:49:26 -0400
Subject: [PATCH 07/20] Focus Close button by default in About pane

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

diff --git a/chrome/content/zotero/about.xul b/chrome/content/zotero/about.xul
index 7f06013e2..76f5ed097 100644
--- a/chrome/content/zotero/about.xul
+++ b/chrome/content/zotero/about.xul
@@ -10,7 +10,7 @@
 	orient="vertical"
 	buttons="accept"
 	buttonlabelaccept="&zotero.about.close;"
-	onload="moveToAlertPosition(); sizeToContent();"
+	onload="moveToAlertPosition(); sizeToContent(); document.documentElement.getButton('accept').focus();"
 	ondialogaccept="return true;">
 	
 	<script src="include.js"/>

From 8b918b21addf6cf440eebe6297d2a480cb499908 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 6 Aug 2013 15:49:45 -0400
Subject: [PATCH 08/20] Capitalize Q library in About pane

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

diff --git a/chrome/content/zotero/about.xul b/chrome/content/zotero/about.xul
index 76f5ed097..08906ccd8 100644
--- a/chrome/content/zotero/about.xul
+++ b/chrome/content/zotero/about.xul
@@ -60,7 +60,7 @@
 				<vbox class="subcontent">
 					<label class="zotero-text-link" href="http://p.yusukekamiyamane.com/" value="Fugue icons (by Yusuke Kamiyamane)"/>
 					<label class="zotero-text-link" href="http://www.davidashen.net/rnv.html" value="RNV (CSL validation)"/>
-					<label class="zotero-text-link" href="http://documentup.com/kriskowal/q/" value="q (by Kristopher Michael Kowal)"/>
+					<label class="zotero-text-link" href="http://documentup.com/kriskowal/q/" value="Q (by Kristopher Michael Kowal)"/>
 					<label class="zotero-text-link" href="http://www.famfamfam.com/lab/icons/silk/" value="Silk icons (by Mark James)"/>
 					<label class="zotero-text-link" href="http://simile.mit.edu/timeline/" value="SIMILE Project (Timeline)"/>
 					<label class="zotero-text-link" href="http://www.w3.org/2005/ajar/tab" value="Tabulator (RDF parser)"/>

From b20a7a572c9fd61a62c434951e09adf565219f6f Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 6 Aug 2013 16:02:49 -0400
Subject: [PATCH 09/20] Disable some debug logging for file syncing

---
 chrome/content/zotero/xpcom/storage.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/chrome/content/zotero/xpcom/storage.js b/chrome/content/zotero/xpcom/storage.js
index e6cd79a7c..d529cc95d 100644
--- a/chrome/content/zotero/xpcom/storage.js
+++ b/chrome/content/zotero/xpcom/storage.js
@@ -705,7 +705,7 @@ Zotero.Sync.Storage = new function () {
 			var memmgr = Components.classes["@mozilla.org/memory-reporter-manager;1"]
 				.getService(Components.interfaces.nsIMemoryReporterManager);
 			memmgr.init();
-			Zotero.debug("Memory usage: " + memmgr.resident);
+			//Zotero.debug("Memory usage: " + memmgr.resident);
 			
 			if (libraryID !== false) {
 				if (itemIDs) {
@@ -819,11 +819,11 @@ Zotero.Sync.Storage = new function () {
 					// Spin the event loop during synchronous file access
 					yield Q.delay(1);
 					
-					Zotero.debug("Memory usage: " + memmgr.resident);
+					//Zotero.debug("Memory usage: " + memmgr.resident);
 					
 					let row = attachmentData[item.id];
 					let lk = item.libraryID + "/" + item.key;
-					Zotero.debug("Checking attachment file for item " + lk);
+					//Zotero.debug("Checking attachment file for item " + lk);
 					
 					var file = item.getFile(row);
 					if (!file) {
@@ -935,12 +935,12 @@ Zotero.Sync.Storage = new function () {
 			let checkItems = function () {
 				if (!items.length) return;
 				
-				Zotero.debug("Memory usage: " + memmgr.resident);
+				//Zotero.debug("Memory usage: " + memmgr.resident);
 				
 				let item = items.shift();
 				let row = attachmentData[item.id];
 				let lk = item.libraryKey;
-				Zotero.debug("Checking attachment file for item " + lk);
+				//Zotero.debug("Checking attachment file for item " + lk);
 				
 				let nsIFile = item.getFile(row, true);
 				let file = null;
@@ -949,10 +949,10 @@ Zotero.Sync.Storage = new function () {
 					file = promisedFile;
 					return file.stat()
 					.then(function (info) {
-						Zotero.debug("Memory usage: " + memmgr.resident);
+						//Zotero.debug("Memory usage: " + memmgr.resident);
 						
 						var fmtime = info.lastModificationDate.getTime();
-						Zotero.debug("File modification time for item " + lk + " is " + fmtime);
+						//Zotero.debug("File modification time for item " + lk + " is " + fmtime);
 						
 						if (fmtime < 1) {
 							Zotero.debug("File mod time " + fmtime + " is less than 1 -- interpreting as 1", 2);
@@ -1038,7 +1038,7 @@ Zotero.Sync.Storage = new function () {
 				})
 				.finally(function () {
 					if (file) {
-						Zotero.debug("Closing file for item " + lk);
+						//Zotero.debug("Closing file for item " + lk);
 						file.close();
 					}
 				})

From 08296b06a57e491a7f5f1388b5596a4c07d0778d Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 6 Aug 2013 16:03:03 -0400
Subject: [PATCH 10/20] Include libraryID in file sync debug message

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

diff --git a/chrome/content/zotero/xpcom/storage.js b/chrome/content/zotero/xpcom/storage.js
index d529cc95d..97bd845da 100644
--- a/chrome/content/zotero/xpcom/storage.js
+++ b/chrome/content/zotero/xpcom/storage.js
@@ -925,7 +925,12 @@ Zotero.Sync.Storage = new function () {
 					Zotero.debug("No synced files have changed locally");
 				}
 				
-				Zotero.debug("Checked " + numItems + " files in " + (new Date() - t) + "ms");
+				let msg = "Checked " + numItems + " files in ";
+				if (libraryID !== false) {
+					msg += "library " + libraryID + " in ";
+				}
+				msg += (new Date() - t) + "ms";
+				Zotero.debug(msg);
 				
 				throw new Task.Result(changed);
 			}
@@ -1074,7 +1079,12 @@ Zotero.Sync.Storage = new function () {
 					Zotero.debug("No synced files have changed locally");
 				}
 				
-				Zotero.debug("Checked " + numItems + " files in " + (new Date() - t) + "ms");
+				let msg = "Checked " + numItems + " files in ";
+				if (libraryID !== false) {
+					msg += "library " + libraryID + " in ";
+				}
+				msg += (new Date() - t) + "ms";
+				Zotero.debug(msg);
 				
 				return changed;
 			}));

From b6f493207f987b71beff53d505369ea5b504dece Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 6 Aug 2013 16:32:02 -0400
Subject: [PATCH 11/20] Closes #311, Update RIS/Refer pref to mention BibTeX
 too

---
 chrome/locale/en-US/zotero/preferences.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index 813ce1207..111aa31b1 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -27,7 +27,7 @@
 <!ENTITY zotero.preferences.reportTranslationFailure		"Report broken site translators">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader			"Allow zotero.org to customize content based on current Zotero version">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader.tooltip	"If enabled, the current Zotero version will be included in HTTP requests to zotero.org.">
-<!ENTITY zotero.preferences.parseRISRefer				"Use Zotero for downloaded RIS/Refer files">
+<!ENTITY zotero.preferences.parseRISRefer				"Use Zotero for downloaded BibTeX/RIS/Refer files">
 <!ENTITY zotero.preferences.automaticSnapshots			"Automatically take snapshots when creating items from web pages">
 <!ENTITY zotero.preferences.downloadAssociatedFiles		"Automatically attach associated PDFs and other files when saving items">
 <!ENTITY zotero.preferences.automaticTags				"Automatically tag items with keywords and subject headings">

From 9d3f55be5193763d4c6d2afc3ddecea0bf5a9f39 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 7 Aug 2013 11:01:12 -0400
Subject: [PATCH 12/20] Use async DB for autocomplete

This was probably hanging previously because I was passing a JS function for
onProgress, which apparently isn't allowed.
---
 chrome/content/zotero/xpcom/db.js |  2 +-
 components/zotero-autocomplete.js | 36 ++-----------------------------
 2 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js
index 4d13d7727..e67a24dce 100644
--- a/chrome/content/zotero/xpcom/db.js
+++ b/chrome/content/zotero/xpcom/db.js
@@ -794,7 +794,7 @@ Zotero.DBConnection.prototype.checkException = function (e) {
 Zotero.DBConnection.prototype.closeDatabase = function () {
 	if(this._connection) {
 		this.stopDummyStatement();
-		this._connection.close();
+		this._connection.asyncClose();
 		return true;
 	}
 }
diff --git a/components/zotero-autocomplete.js b/components/zotero-autocomplete.js
index 2e793879d..041ce47b8 100644
--- a/components/zotero-autocomplete.js
+++ b/components/zotero-autocomplete.js
@@ -223,37 +223,8 @@ ZoteroAutoComplete.prototype.startSearch = function(searchString, searchParams,
 			statement = this._zotero.DB.getStatement(sql, sqlParams);
 	}
 	
-	// Disable asynchronous until we figure out the hangs
-	if (true) {
-		var rows = this._zotero.DB.query(sql, sqlParams);
-		
-		if (resultsCallback) {
-			resultsCallback(rows);
-		}
-		
-		var results = [];
-		var comments = [];
-		for each(var row in rows) {
-			results.push(row.val);
-			let comment = row.comment;
-			if (comment) {
-				comments.push(comment);
-			}
-		}
-		this.updateResults(results, comments);
-		return;
-	}
-	
 	var self = this;
 	
-	this._zotero.DB._connection.setProgressHandler(5000, {
-		onProgress: function (connection) {
-			if (self._cancelled) {
-				return true;
-			}
-		}
-	});
-	
 	this.pendingStatement = statement.executeAsync({
 		handleResult: function (storageResultSet) {
 			self._zotero.debug("Handling autocomplete results");
@@ -282,7 +253,7 @@ ZoteroAutoComplete.prototype.startSearch = function(searchString, searchParams,
 		},
 		
 		handleError: function (e) {
-			//Components.utils.reportError(e.message);
+			Components.utils.reportError(e.message);
 		},
 		
 		handleCompletion: function (reason) {
@@ -352,10 +323,7 @@ ZoteroAutoComplete.prototype.updateResults = function (results, comments, ongoin
 ZoteroAutoComplete.prototype.stopSearch = function(){
 	if (this.pendingStatement) {
 		this._zotero.debug('Stopping autocomplete search');
-		// This appears to take as long as letting the query complete,
-		// so we flag instead and abort from the progress handler
-		//this.pendingStatement.cancel();
-		this._cancelled = true;
+		this.pendingStatement.cancel();
 	}
 }
 

From 39e92bacb3a889ad0aecf816360c64c4f62a6f4c Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 7 Aug 2013 13:17:25 -0400
Subject: [PATCH 13/20] Focus title field when creating new item via menu or
 shortcut key

---
 chrome/content/zotero/zoteroPane.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 784e4780f..953a8cc5e 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -658,6 +658,8 @@ var ZoteroPane = new function()
 					var handleTypeChange = function () {
 						self.addItemTypeToNewItemTypeMRU(this.itemTypeMenu.value);
 						itemBox.removeHandler('itemtypechange', handleTypeChange);
+						// Focus the title field after menu closes
+						itemBox.focusFirstField();
 					};
 					// Only update the MRU when the menu is opened for the
 					// keyboard shortcut, not on subsequent opens
@@ -765,8 +767,11 @@ var ZoteroPane = new function()
 		//set to Info tab
 		document.getElementById('zotero-view-item').selectedIndex = 0;
 		
-		// Update most-recently-used list for New Item menu
 		if (manual) {
+			// Focus the title field
+			document.getElementById('zotero-editpane-item-box').focusFirstField();
+			
+			// Update most-recently-used list for New Item menu
 			this.addItemTypeToNewItemTypeMRU(typeID);
 		}
 		

From 7572eebcd1538dfa5ea33a42b8b7874d2081d4e3 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 7 Aug 2013 15:20:59 -0400
Subject: [PATCH 14/20] Offer autocomplete of same creator for different
 creator types

If a creator exists on an item but is a different creator type than the
one being entered, show creator in autocomplete list.
---
 chrome/content/zotero/bindings/itembox.xml | 52 +++++++++++++++++++---
 components/zotero-autocomplete.js          | 14 +++---
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index d763c9297..34538c8ac 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -1422,13 +1422,25 @@
 								|| fieldName == 'creator') {
 							t.setAttribute('type', 'autocomplete');
 							t.setAttribute('autocompletesearch', 'zotero');
-							let params = {
+							
+							var params = {
 								fieldName: fieldName,
 								libraryID: this.item.libraryID
 							};
 							if (field == 'creator') {
 								params.fieldMode = parseInt(elem.getAttribute('fieldMode'));
-								params.itemID = itemID ? itemID : '';
+								
+								// Include itemID and creatorTypeID so the autocomplete can
+								// avoid showing results for creators already set on the item
+								var row = Zotero.getAncestorByTagName(elem, 'row');
+								var creatorTypeID = parseInt(
+									row.getElementsByClassName('creator-type-label')[0]
+									.getAttribute('typeid')
+								);
+								if (itemID) {
+									params.itemID = itemID;
+									params.creatorTypeID = creatorTypeID;
+								}
 							};
 							t.setAttribute(
 								'autocompletesearchparam', JSON.stringify(params)
@@ -2163,6 +2175,25 @@
 				</body>
 			</method>
 			
+			
+			<method name="_updateAutoCompleteParams">
+				<parameter name="row"/>
+				<parameter name="changedParams"/>
+				<body>
+				<![CDATA[
+					var textboxes = row.getElementsByTagName('textbox');
+					if (textboxes.length) {
+						var t = textboxes[0];
+						var params = JSON.parse(t.getAttribute('autocompletesearchparam'));
+						for (var param in changedParams) {
+							params[param] = changedParams[param];
+						}
+						t.setAttribute('autocompletesearchparam', JSON.stringify(params));
+					}
+				]]>
+				</body>
+			</method>
+			
 			<!--
 			/*
 			function modifyCreatorByID(index, creatorID, creatorTypeID) {
@@ -2365,15 +2396,17 @@
 						oncommand="var typeBox = document.popupNode.localName == 'hbox' ? document.popupNode : document.popupNode.parentNode;
 							var index = parseInt(typeBox.getAttribute('fieldname').split('-')[1]);
 							
+							var itemBox = document.getBindingParent(this);
+							
 							if (event.explicitOriginalTarget.className == 'zotero-creator-move') {
 								var up = event.explicitOriginalTarget.id == 'zotero-creator-move-up';
-								document.getBindingParent(this).moveCreator(index, up);
+								itemBox.moveCreator(index, up);
 								return;
 							}
 							
 							var typeID = event.explicitOriginalTarget.getAttribute('typeid');
 							var row = typeBox.parentNode;
-							var fields = document.getBindingParent(this).getCreatorFields(row);
+							var fields = itemBox.getCreatorFields(row);
 							fields.creatorTypeID = typeID;
 							typeBox.getElementsByTagName('label')[0].setAttribute(
 								'value',
@@ -2382,7 +2415,16 @@
 								) + ':'
 							);
 							typeBox.setAttribute('typeid', typeID);
-							document.getBindingParent(this).modifyCreator(index, fields);"/>
+							
+							// If a creator textbox is already open, we need to
+							// change its autocomplete parameters so that it
+							// completes on a creator with a different creator type
+							var changedParams = {
+								creatorTypeID: typeID
+							};
+							itemBox._updateAutoCompleteParams(row, changedParams);
+							
+							itemBox.modifyCreator(index, fields);"/>
 					<menupopup id="zotero-field-transform-menu">
 						<menu label="&zotero.item.textTransform;">
 							<menupopup>
diff --git a/components/zotero-autocomplete.js b/components/zotero-autocomplete.js
index 041ce47b8..331cdb144 100644
--- a/components/zotero-autocomplete.js
+++ b/components/zotero-autocomplete.js
@@ -140,23 +140,26 @@ ZoteroAutoComplete.prototype.startSearch = function(searchString, searchParams,
 				}
 				
 				var fromSQL = " FROM creators NATURAL JOIN creatorData "
-					+ "WHERE " + subField + " LIKE ?1 " + "AND fieldMode=?2";
+					+ "WHERE " + subField + " LIKE ? " + "AND fieldMode=?";
 				var sqlParams = [
 					searchString + '%',
 					searchParams.fieldMode ? searchParams.fieldMode : 0
 				];
 				if (searchParams.itemID) {
 					fromSQL += " AND creatorID NOT IN (SELECT creatorID FROM "
-						+ "itemCreators WHERE itemID=?3)";
+						+ "itemCreators WHERE itemID=?";
 					sqlParams.push(searchParams.itemID);
+					if (searchParams.creatorTypeID) {
+						fromSQL += " AND creatorTypeID=?";
+						sqlParams.push(searchParams.creatorTypeID);
+					}
+					fromSQL += ")";
 				}
 				if (typeof searchParams.libraryID != 'undefined') {
 					if (searchParams.libraryID) {
-						fromSQL += " AND libraryID=?4";
+						fromSQL += " AND libraryID=?";
 						sqlParams.push(searchParams.libraryID);
 					}
-					// The db query code doesn't properly replace numbered
-					// parameters with "IS NULL"
 					else {
 						fromSQL += " AND libraryID IS NULL";
 					}
@@ -170,6 +173,7 @@ ZoteroAutoComplete.prototype.startSearch = function(searchString, searchParams,
 					sql = "SELECT * FROM (" + sql + " UNION SELECT DISTINCT "
 						+ subField + " AS val, creatorID || '-1' AS comment"
 						+ fromSQL + ") GROUP BY val";
+					sqlParams = sqlParams.concat(sqlParams);
 				}
 				
 				sql += " ORDER BY val";

From a3375d540b972a8cf7fb14f3850278c341a60643 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 7 Aug 2013 17:06:48 -0400
Subject: [PATCH 15/20] Fix comment that broke 7572eebcd

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

diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index 34538c8ac..f7718ac63 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -2416,9 +2416,9 @@
 							);
 							typeBox.setAttribute('typeid', typeID);
 							
-							// If a creator textbox is already open, we need to
-							// change its autocomplete parameters so that it
-							// completes on a creator with a different creator type
+							/* If a creator textbox is already open, we need to
+							change its autocomplete parameters so that it
+							completes on a creator with a different creator type */
 							var changedParams = {
 								creatorTypeID: typeID
 							};

From 2bd0019261f98a631a21e19463553272c1a2965f Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 7 Aug 2013 17:09:41 -0400
Subject: [PATCH 16/20] 'let' is valid in XBL, just not in event attributes, I
 guess

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

diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index f7718ac63..55bbb0e7b 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -1423,7 +1423,7 @@
 							t.setAttribute('type', 'autocomplete');
 							t.setAttribute('autocompletesearch', 'zotero');
 							
-							var params = {
+							let params = {
 								fieldName: fieldName,
 								libraryID: this.item.libraryID
 							};
@@ -1432,8 +1432,8 @@
 								
 								// Include itemID and creatorTypeID so the autocomplete can
 								// avoid showing results for creators already set on the item
-								var row = Zotero.getAncestorByTagName(elem, 'row');
-								var creatorTypeID = parseInt(
+								let row = Zotero.getAncestorByTagName(elem, 'row');
+								let creatorTypeID = parseInt(
 									row.getElementsByClassName('creator-type-label')[0]
 									.getAttribute('typeid')
 								);

From b673718f2a8cf63fbdecda153731c3ee123404d7 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 7 Aug 2013 17:11:25 -0400
Subject: [PATCH 17/20] Update maxVersion

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

diff --git a/install.rdf b/install.rdf
index 74350e697..603aad63f 100644
--- a/install.rdf
+++ b/install.rdf
@@ -25,7 +25,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>17.0</em:minVersion>
-        <em:maxVersion>22.*</em:maxVersion>
+        <em:maxVersion>23.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     
diff --git a/update.rdf b/update.rdf
index e761ab111..6277e0903 100644
--- a/update.rdf
+++ b/update.rdf
@@ -12,7 +12,7 @@
             <RDF:Description>
               <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>
               <minVersion>17.0</minVersion>
-              <maxVersion>22.*</maxVersion>
+              <maxVersion>23.*</maxVersion>
               <updateLink>http://download.zotero.org/extension/zotero.xpi</updateLink>
               <updateHash>sha1:</updateHash>
             </RDF:Description>

From 517ca6f342eeb5bcc0c1a58cf787ee27573575f9 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 7 Aug 2013 17:42:15 -0400
Subject: [PATCH 18/20] Force quit after zapping cache files to prevent
 destroying prefs

---
 chrome/content/zotero/standalone/standalone.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js
index a94e81277..1204bcc8e 100644
--- a/chrome/content/zotero/standalone/standalone.js
+++ b/chrome/content/zotero/standalone/standalone.js
@@ -157,18 +157,23 @@ const ZoteroStandalone = new function() {
 				getService(Components.interfaces.nsIEnvironment);
 			var user = env.get("USER") || env.get("USERNAME");
 			if(user === "root") {
-				// Zap cache files
-				try {
-					Services.dirsvc.get("ProfLD", Components.interfaces.nsIFile).remove(true);
-				} catch(e) {}
-				// Warn user never to do this again
+				// Show warning
 				if(Services.prompt.confirmEx(null, "", Zotero.getString("standalone.rootWarning"),
 						Services.prompt.BUTTON_POS_0*Services.prompt.BUTTON_TITLE_IS_STRING |
 						Services.prompt.BUTTON_POS_1*Services.prompt.BUTTON_TITLE_IS_STRING,
 						Zotero.getString("standalone.rootWarning.exit"),
 						Zotero.getString("standalone.rootWarning.continue"),
 						null, null, {}) == 0) {
-					goQuitApplication();
+					Components.utils.import("resource://gre/modules/ctypes.jsm");
+					var exit = Zotero.IPC.getLibc().declare("exit", ctypes.default_abi,
+						                                    ctypes.void_t, ctypes.int);
+					// Zap cache files
+					try {
+						Services.dirsvc.get("ProfLD", Components.interfaces.nsIFile).remove(true);
+					} catch(e) {}
+					// Exit Zotero without giving XULRunner the opportunity to figure out the
+					// cache is missing. Otherwise XULRunner will zap the prefs
+					exit(0);
 				}
 			}
 		}

From e1327877749cbace21d551d2e62d22a56fd26890 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 7 Aug 2013 18:32:40 -0400
Subject: [PATCH 19/20] Move root check to before DB initialization

---
 .../content/zotero/standalone/standalone.js   | 32 -------------------
 chrome/content/zotero/xpcom/zotero.js         | 32 +++++++++++++++++++
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js
index 1204bcc8e..0d6e66698 100644
--- a/chrome/content/zotero/standalone/standalone.js
+++ b/chrome/content/zotero/standalone/standalone.js
@@ -38,7 +38,6 @@ const ZoteroStandalone = new function() {
 			window.close();
 			return;
 		}
-		_checkRoot();
 		ZoteroPane.init();
 		ZoteroPane.makeVisible();
 		
@@ -147,37 +146,6 @@ const ZoteroStandalone = new function() {
 	this.onUnload = function() {
 		ZoteroPane.destroy();
 	}
-
-	/**
-	 * Warn if Zotero Standalone is running as root and clobber the cache directory
-	 */
-	function _checkRoot() {
-		if(!Zotero.isWin) {
-			var env = Components.classes["@mozilla.org/process/environment;1"].
-				getService(Components.interfaces.nsIEnvironment);
-			var user = env.get("USER") || env.get("USERNAME");
-			if(user === "root") {
-				// Show warning
-				if(Services.prompt.confirmEx(null, "", Zotero.getString("standalone.rootWarning"),
-						Services.prompt.BUTTON_POS_0*Services.prompt.BUTTON_TITLE_IS_STRING |
-						Services.prompt.BUTTON_POS_1*Services.prompt.BUTTON_TITLE_IS_STRING,
-						Zotero.getString("standalone.rootWarning.exit"),
-						Zotero.getString("standalone.rootWarning.continue"),
-						null, null, {}) == 0) {
-					Components.utils.import("resource://gre/modules/ctypes.jsm");
-					var exit = Zotero.IPC.getLibc().declare("exit", ctypes.default_abi,
-						                                    ctypes.void_t, ctypes.int);
-					// Zap cache files
-					try {
-						Services.dirsvc.get("ProfLD", Components.interfaces.nsIFile).remove(true);
-					} catch(e) {}
-					// Exit Zotero without giving XULRunner the opportunity to figure out the
-					// cache is missing. Otherwise XULRunner will zap the prefs
-					exit(0);
-				}
-			}
-		}
-	}
 }
 
 /** Taken from browser.js **/
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index d8be90daf..b331840fc 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -308,6 +308,9 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 		else {
 			Zotero.dir = 'ltr';
 		}
+
+		// Make sure that Zotero Standalone is not running as root
+		if(Zotero.isStandalone && !Zotero.isWin) _checkRoot();
 		
 		try {
 			var dataDir = Zotero.getZoteroDirectory();
@@ -1962,6 +1965,35 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 		
 		return true;
 	}
+
+	/**
+	 * Warn if Zotero Standalone is running as root and clobber the cache directory if it is
+	 */
+	function _checkRoot() {
+		var env = Components.classes["@mozilla.org/process/environment;1"].
+			getService(Components.interfaces.nsIEnvironment);
+		var user = env.get("USER") || env.get("USERNAME");
+		if(user === "root") {
+			// Show warning
+			if(Services.prompt.confirmEx(null, "", Zotero.getString("standalone.rootWarning"),
+					Services.prompt.BUTTON_POS_0*Services.prompt.BUTTON_TITLE_IS_STRING |
+					Services.prompt.BUTTON_POS_1*Services.prompt.BUTTON_TITLE_IS_STRING,
+					Zotero.getString("standalone.rootWarning.exit"),
+					Zotero.getString("standalone.rootWarning.continue"),
+					null, null, {}) == 0) {
+				Components.utils.import("resource://gre/modules/ctypes.jsm");
+				var exit = Zotero.IPC.getLibc().declare("exit", ctypes.default_abi,
+					                                    ctypes.void_t, ctypes.int);
+				// Zap cache files
+				try {
+					Services.dirsvc.get("ProfLD", Components.interfaces.nsIFile).remove(true);
+				} catch(e) {}
+				// Exit Zotero without giving XULRunner the opportunity to figure out the
+				// cache is missing. Otherwise XULRunner will zap the prefs
+				exit(0);
+			}
+		}
+	}
 	
 	/**
 	 * Observer for console messages

From 8bdac7015be46ae834565949738b76ca01340740 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 7 Aug 2013 20:24:20 -0400
Subject: [PATCH 20/20] Focus title on shortcut key new item even if item type
 isn't changed

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

diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 953a8cc5e..c5b9b7fa3 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -658,14 +658,14 @@ var ZoteroPane = new function()
 					var handleTypeChange = function () {
 						self.addItemTypeToNewItemTypeMRU(this.itemTypeMenu.value);
 						itemBox.removeHandler('itemtypechange', handleTypeChange);
-						// Focus the title field after menu closes
-						itemBox.focusFirstField();
 					};
 					// Only update the MRU when the menu is opened for the
 					// keyboard shortcut, not on subsequent opens
 					var removeTypeChangeHandler = function () {
 						itemBox.removeHandler('itemtypechange', handleTypeChange);
 						itemBox.itemTypeMenu.firstChild.removeEventListener('popuphiding', removeTypeChangeHandler);
+						// Focus the title field after menu closes
+						itemBox.focusFirstField();
 					};
 					itemBox.addHandler('itemtypechange', handleTypeChange);
 					itemBox.itemTypeMenu.firstChild.addEventListener('popuphiding', removeTypeChangeHandler);