From 7150d38cf1de0b521200a373b9dda5ed28857b48 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 30 Dec 2009 07:22:53 +0000
Subject: [PATCH] Addresses #1475, Localize add-on strings

Localizes most (though not quite all) of the new unlocalized strings, hopefully without breaking anything
---
 chrome/content/zotero/browser.js              |   8 +-
 chrome/content/zotero/fileInterface.js        |   3 +-
 chrome/content/zotero/longTagFixer.js         |  11 +-
 chrome/content/zotero/longTagFixer.xul        |  31 +++--
 chrome/content/zotero/merge.js                |   3 +-
 chrome/content/zotero/overlay.js              |  17 ++-
 chrome/content/zotero/overlay.xul             |  15 +--
 .../content/zotero/preferences/preferences.js |   5 +-
 .../zotero/preferences/preferences.xul        |  96 +++++++--------
 chrome/content/zotero/xpcom/ingester.js       |   5 +-
 chrome/content/zotero/xpcom/schema.js         |   8 +-
 chrome/content/zotero/xpcom/storage.js        |  36 ++----
 chrome/content/zotero/xpcom/storage/webdav.js |  84 +++++++------
 chrome/content/zotero/xpcom/sync.js           |  92 ++++++--------
 chrome/content/zotero/xpcom/zotero.js         |  47 +++----
 chrome/locale/af-ZA/zotero/zotero.dtd         |   2 -
 chrome/locale/af-ZA/zotero/zotero.properties  |   3 +-
 chrome/locale/ar/zotero/zotero.dtd            |   2 -
 chrome/locale/ar/zotero/zotero.properties     |   3 +-
 chrome/locale/bg-BG/zotero/zotero.dtd         |   2 -
 chrome/locale/bg-BG/zotero/zotero.properties  |   3 +-
 chrome/locale/ca-AD/zotero/zotero.dtd         |   2 -
 chrome/locale/ca-AD/zotero/zotero.properties  |   3 +-
 chrome/locale/cs-CZ/zotero/zotero.dtd         |   2 -
 chrome/locale/cs-CZ/zotero/zotero.properties  |   3 +-
 chrome/locale/da-DK/zotero/zotero.dtd         |   2 -
 chrome/locale/da-DK/zotero/zotero.properties  |   3 +-
 chrome/locale/de-AT/zotero/zotero.dtd         |   2 -
 chrome/locale/de-AT/zotero/zotero.properties  |   3 +-
 chrome/locale/de-CH/zotero/zotero.dtd         |   2 -
 chrome/locale/de-CH/zotero/zotero.properties  |   3 +-
 chrome/locale/de-DE/zotero/zotero.dtd         |   2 -
 chrome/locale/de-DE/zotero/zotero.properties  |   3 +-
 chrome/locale/el-GR/zotero/zotero.dtd         |   2 -
 chrome/locale/el-GR/zotero/zotero.properties  |   3 +-
 chrome/locale/en-US/zotero/preferences.dtd    |  46 ++++++-
 chrome/locale/en-US/zotero/zotero.dtd         |  24 +++-
 chrome/locale/en-US/zotero/zotero.properties  | 115 ++++++++++++++++--
 chrome/locale/es-ES/zotero/zotero.dtd         |   2 -
 chrome/locale/es-ES/zotero/zotero.properties  |   3 +-
 chrome/locale/et-EE/zotero/zotero.dtd         |   2 -
 chrome/locale/et-EE/zotero/zotero.properties  |   3 +-
 chrome/locale/fi-FI/zotero/zotero.dtd         |   2 -
 chrome/locale/fi-FI/zotero/zotero.properties  |   3 +-
 chrome/locale/fr-FR/zotero/zotero.dtd         |   2 -
 chrome/locale/fr-FR/zotero/zotero.properties  |   3 +-
 chrome/locale/gl-ES/zotero/zotero.dtd         |   2 -
 chrome/locale/gl-ES/zotero/zotero.properties  |   3 +-
 chrome/locale/he-IL/zotero/zotero.dtd         |   2 -
 chrome/locale/he-IL/zotero/zotero.properties  |   3 +-
 chrome/locale/hr-HR/zotero/zotero.dtd         |   2 -
 chrome/locale/hr-HR/zotero/zotero.properties  |   3 +-
 chrome/locale/hu-HU/zotero/zotero.dtd         |   2 -
 chrome/locale/hu-HU/zotero/zotero.properties  |   3 +-
 chrome/locale/is-IS/zotero/zotero.dtd         |   2 -
 chrome/locale/is-IS/zotero/zotero.properties  |   3 +-
 chrome/locale/it-IT/zotero/zotero.dtd         |   2 -
 chrome/locale/it-IT/zotero/zotero.properties  |   3 +-
 chrome/locale/ja-JP/zotero/zotero.dtd         |   2 -
 chrome/locale/ja-JP/zotero/zotero.properties  |   3 +-
 chrome/locale/ko-KR/zotero/zotero.dtd         |   2 -
 chrome/locale/ko-KR/zotero/zotero.properties  |   3 +-
 chrome/locale/mn-MN/zotero/zotero.dtd         |   2 -
 chrome/locale/mn-MN/zotero/zotero.properties  |   3 +-
 chrome/locale/nb-NO/zotero/zotero.dtd         |   2 -
 chrome/locale/nb-NO/zotero/zotero.properties  |   3 +-
 chrome/locale/nl-NL/zotero/zotero.dtd         |   2 -
 chrome/locale/nl-NL/zotero/zotero.properties  |   3 +-
 chrome/locale/pl-PL/zotero/zotero.dtd         |   2 -
 chrome/locale/pl-PL/zotero/zotero.properties  |   3 +-
 chrome/locale/pt-BR/zotero/zotero.dtd         |   2 -
 chrome/locale/pt-BR/zotero/zotero.properties  |   3 +-
 chrome/locale/pt-PT/zotero/zotero.dtd         |   2 -
 chrome/locale/pt-PT/zotero/zotero.properties  |   3 +-
 chrome/locale/ro-RO/zotero/zotero.dtd         |   2 -
 chrome/locale/ro-RO/zotero/zotero.properties  |   3 +-
 chrome/locale/ru-RU/zotero/zotero.dtd         |   2 -
 chrome/locale/ru-RU/zotero/zotero.properties  |   3 +-
 chrome/locale/sk-SK/zotero/zotero.dtd         |   2 -
 chrome/locale/sk-SK/zotero/zotero.properties  |   3 +-
 chrome/locale/sl-SI/zotero/zotero.dtd         |   2 -
 chrome/locale/sl-SI/zotero/zotero.properties  |   3 +-
 chrome/locale/sr-RS/zotero/zotero.dtd         |   2 -
 chrome/locale/sr-RS/zotero/zotero.properties  |   3 +-
 chrome/locale/sv-SE/zotero/zotero.dtd         |   2 -
 chrome/locale/sv-SE/zotero/zotero.properties  |   3 +-
 chrome/locale/th-TH/zotero/zotero.dtd         |   2 -
 chrome/locale/th-TH/zotero/zotero.properties  |   3 +-
 chrome/locale/tr-TR/zotero/zotero.dtd         |   2 -
 chrome/locale/tr-TR/zotero/zotero.properties  |   3 +-
 chrome/locale/vi-VN/zotero/zotero.dtd         |   2 -
 chrome/locale/vi-VN/zotero/zotero.properties  |   3 +-
 chrome/locale/zh-CN/zotero/zotero.dtd         |   2 -
 chrome/locale/zh-CN/zotero/zotero.properties  |   3 +-
 chrome/locale/zh-TW/zotero/zotero.dtd         |   2 -
 chrome/locale/zh-TW/zotero/zotero.properties  |   3 +-
 96 files changed, 424 insertions(+), 417 deletions(-)

diff --git a/chrome/content/zotero/browser.js b/chrome/content/zotero/browser.js
index 1588bb8be2..e9159e1689 100644
--- a/chrome/content/zotero/browser.js
+++ b/chrome/content/zotero/browser.js
@@ -128,8 +128,10 @@ var Zotero_Browser = new function() {
 	function scrapeThisPage(libraryID, collectionID) {
 		if (Zotero.locked) {
 			Zotero_Browser.progress.changeHeadline(Zotero.getString("ingester.scrapeError"));
-			// TODO: localize
-			var desc = "A Zotero operation is currently in progress. Please wait until it finishes and try again.";
+			var desc = Zotero.localeJoin([
+				Zotero.getString('general.operationInProgress'),
+				Zotero.getString('general.operationInProgress.waitUntilFinishedAndTryAgain')
+			]);
 			Zotero_Browser.progress.addDescription(desc);
 			Zotero_Browser.progress.show();
 			Zotero_Browser.progress.startCloseTimer(8000);
@@ -139,7 +141,7 @@ var Zotero_Browser = new function() {
 		
 		if (!Zotero.stateCheck()) {
 			Zotero_Browser.progress.changeHeadline(Zotero.getString("ingester.scrapeError"));
-			var desc = Zotero.getString("ingester.scrapeError.transactionInProgress.previousError")
+			var desc = Zotero.getString("ingester.scrapeErrorDescription.previousError")
 				+ ' ' + Zotero.getString("general.restartFirefoxAndTryAgain");
 			Zotero_Browser.progress.addDescription(desc);
 			Zotero_Browser.progress.show();
diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js
index d0ad40afb6..5b61c316ec 100644
--- a/chrome/content/zotero/fileInterface.js
+++ b/chrome/content/zotero/fileInterface.js
@@ -224,10 +224,9 @@ var Zotero_File_Interface = new function() {
 		var clip = Components.classes["@mozilla.org/widget/clipboard;1"]
 					.getService(Components.interfaces.nsIClipboard);
 		if (!clip.hasDataMatchingFlavors(["text/unicode"], 1, clip.kGlobalClipboard)) {
-			// TODO: localize
 			var prompt = Components.classes["@mozilla.org/network/default-prompt;1"]
 							.getService(Components.interfaces.nsIPrompt);
-			prompt.alert("", "No importable data could be read from the clipboard.");
+			prompt.alert("", Zotero.getString('fileInterface.importClipboardNoDataError'));
 			return;
 		}
 		var trans = Components.classes["@mozilla.org/widget/transferable;1"]
diff --git a/chrome/content/zotero/longTagFixer.js b/chrome/content/zotero/longTagFixer.js
index 75c2b0fd4c..9b982bb910 100644
--- a/chrome/content/zotero/longTagFixer.js
+++ b/chrome/content/zotero/longTagFixer.js
@@ -30,7 +30,7 @@ var Zotero_Long_Tag_Fixer = new function () {
 	
 	this.init = function () {
 		document.getElementById('zotero-old-tag').value = _oldTag;
-		document.getElementById('zotero-old-tag-delimiter').nextSibling.value = 'character'; // TODO: localize
+		document.getElementById('zotero-old-tag-delimiter').nextSibling.value = Zotero.getString('general.character.singular');
 		
 		var delimiter = Zotero.Prefs.get('lastLongTagDelimiter');
 		document.getElementById('zotero-old-tag-delimiter').value = delimiter;
@@ -47,27 +47,26 @@ var Zotero_Long_Tag_Fixer = new function () {
 		
 		document.getElementById('zotero-new-tag-actions').selectedIndex = index;
 		
-		// TODO: localize
 		switch (index) {
 			case 0:
-				var buttonLabel = "Save Tags";
+				var buttonLabel = "saveTags";
 				this.updateTagList();
 				document.getElementById('zotero-old-tag-delimiter').select();
 				break;
 				
 			case 1:
-				var buttonLabel = "Save Tag";
+				var buttonLabel = "saveTag";
 				document.getElementById('zotero-new-tag-editor').value = _oldTag;
 				this.updateEditLength(_oldTag.length)
 				break;
 				
 			case 2:
-				var buttonLabel = "Delete Tag";
+				var buttonLabel = "deleteTag";
 				dialog.getButton('accept').disabled = false;
 				break;
 		}
 		
-		document.getElementById('zotero-long-tag-fixer').getButton('accept').label = buttonLabel;
+		document.getElementById('zotero-long-tag-fixer').getButton('accept').label = Zotero.getString('sync.longTagFixer.' + buttonLabel);
 		window.sizeToContent();
 		Zotero.Prefs.set('lastLongTagMode', index);
 	}
diff --git a/chrome/content/zotero/longTagFixer.xul b/chrome/content/zotero/longTagFixer.xul
index 13ab1ab64b..408dfc8a2e 100644
--- a/chrome/content/zotero/longTagFixer.xul
+++ b/chrome/content/zotero/longTagFixer.xul
@@ -1,44 +1,43 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://zotero/skin/longTagFixer.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
 <dialog id="zotero-long-tag-fixer" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 		buttons="accept,cancel"
 		onload="Zotero_Long_Tag_Fixer.init()"
 		ondialogcancel="Zotero_Long_Tag_Fixer.cancel()"
 		ondialogaccept="Zotero_Long_Tag_Fixer.save()"
-		title="Sync Error"> <!-- TODO: localize -->
+		title="&zotero.sync.error;">
 	
 	<script src="include.js"/>
 	<script src="longTagFixer.js"/>
 	
-	<!-- TODO: localize -->
-	<label value="The following tag in your Zotero library is too long to sync to the server:"/>
+	<label value="&zotero.sync.longTagFixer.followingTagTooLong;"/>
 	<groupbox>
 		<textbox id="zotero-old-tag" multiline="true" rows="4" readonly="true" class="plain"/>
 	</groupbox>
-	<label>Synced tags must be shorter than 256 characters.</label>
+	<label>&zotero.sync.longTagFixer.syncedTagSizeLimit;</label>
 	
 	<separator class="thin"/>
 	
-	<label value="You can either split the tag into multiple tags, edit the tag manually to shorten it, or delete it."/>
+	<label value="&zotero.sync.longTagFixer.splitEditDelete;"/>
 	
 	<separator/>
 	
 	<tabbox id="zotero-new-tag-actions">
 		<tabs oncommand="Zotero_Long_Tag_Fixer.switchMode(this.selectedIndex)">
-			<tab label="Split"/>
-			<tab label="Edit"/>
-			<tab label="Delete"/>
+			<tab label="&zotero.sync.longTagFixer.split;"/>
+			<tab label="&zotero.general.edit;"/>
+			<tab label="&zotero.general.delete;"/>
 		</tabs>
 		<tabpanels>
 			<!-- Split -->
 			<vbox>
 				<hbox align="center">
-					<label>Split at the </label>
-					<!--  // TODO: localize -->
+					<label>&zotero.sync.longTagFixer.splitAtThe;</label>
 					<textbox id="zotero-old-tag-delimiter" size="1"
-						oninput="this.nextSibling.value = this.value.length > 1  ? 'characters' : 'character'; Zotero_Long_Tag_Fixer.updateTagList();"/>
+						oninput="this.nextSibling.value = Zotero.getString('general.character.' + (this.value.length > 1  ? 'plural' : 'singular')); Zotero_Long_Tag_Fixer.updateTagList();"/>
 					<label/>
 				</hbox>
 				
@@ -48,11 +47,11 @@
 				
 				<separator class="thin"/>
 				
-				<label value="Unchecked tags will not be saved."/>
+				<label value="&zotero.sync.longTagFixer.uncheckedTagsNotSaved;"/>
 				
 				<hbox>
-					<button label="Deselect All" oncommand="Zotero_Long_Tag_Fixer.deselectAll()"/>
-					<button label="Select All" oncommand="Zotero_Long_Tag_Fixer.selectAll()"/>
+					<button label="&zotero.general.deselectAll;" oncommand="Zotero_Long_Tag_Fixer.deselectAll()"/>
+					<button label="&zotero.general.selectAll;" oncommand="Zotero_Long_Tag_Fixer.selectAll()"/>
 				</hbox>
 			</vbox>
 			
@@ -62,13 +61,13 @@
 					oninput="Zotero_Long_Tag_Fixer.updateEditLength(this.value.length)"/>
 				<hbox id="zotero-new-tag-characters">
 					<label id="zotero-new-tag-character-count"/>
-					<label value="characters"/>
+					<label value="&zotero.sync.longTagFixer.characters;"/>
 				</hbox>
 			</vbox>
 			
 			<!-- Delete -->
 			<vbox align="center" pack="center">
-				<label value="The tag will be deleted from all items."/>
+				<label value="&zotero.sync.longTagFixer.tagWillBeDeleted;"/>
 			</vbox>
 		</tabpanels>
 	</tabbox>
diff --git a/chrome/content/zotero/merge.js b/chrome/content/zotero/merge.js
index 4c6c579448..c4d2172bfe 100644
--- a/chrome/content/zotero/merge.js
+++ b/chrome/content/zotero/merge.js
@@ -53,8 +53,7 @@ var Zotero_Merge_Window = new function () {
 		// Set font size from pref
 		Zotero.setFontSize(_wizardPage);
 		
-		// TODO: localize
-		_wizard.getButton('cancel').setAttribute('label', "Cancel Sync")
+		_wizard.getButton('cancel').setAttribute('label', Zotero.getString('sync.cancel'));
 		
 		_io = window.arguments[0];
 		_objects = _io.dataIn.objects;
diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 34901a038d..5b56d5326e 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -267,8 +267,7 @@ var ZoteroPane = new function()
 			if (Zotero.locked) {
 				var pr = Components.classes["@mozilla.org/network/default-prompt;1"]
 							.getService(Components.interfaces.nsIPrompt);
-				// TODO: localize
-				var msg = "Another Zotero operation is currently in progress.\n\nPlease wait until it has finished.";
+				var msg = Zotero.getString('general.operationInProgress') + '\n\n' + Zotero.getString('general.operationInProgress.waitUntilFinished');
 				pr.alert("", msg);
 				return;
 			}
@@ -1247,11 +1246,11 @@ var ZoteroPane = new function()
 			return;
 		}
 		
-		// TODO: localize
 		var toTrash = {
-			title: "Move to Trash",
-			text: "Are you sure you want to move the selected item"
-					+ (this.itemsView.selection.count>1 ? 's' : '') + " to the Trash?"
+			title: Zotero.getString('pane.items.trash.title'),
+			text: Zotero.getString(
+				'pane.items.trash' +  + (this.itemsView.selection.count > 1 ? '.multiple' : '')
+			)
 		};
 		var toDelete = {
 			title: Zotero.getString('pane.items.delete.title'),
@@ -2096,11 +2095,9 @@ var ZoteroPane = new function()
 		menu.childNodes[m.exportItems].setAttribute('label', Zotero.getString('pane.items.menu.export' + multiple));
 		menu.childNodes[m.createBib].setAttribute('label', Zotero.getString('pane.items.menu.createBib' + multiple));
 		menu.childNodes[m.loadReport].setAttribute('label', Zotero.getString('pane.items.menu.generateReport' + multiple));
-		// TODO: localize
-		menu.childNodes[m.createParent].setAttribute('label', multiple ? "Create Parent Items from Selected Items" : "Create Parent Item from Selected Item");
+		menu.childNodes[m.createParent].setAttribute('label', Zotero.getString('pane.items.menu.createParent' + multiple));
 		menu.childNodes[m.recognizePDF].setAttribute('label', Zotero.getString('pane.items.menu.recognizePDF' + multiple));
-		// TODO: localize
-		menu.childNodes[m.renameAttachments].setAttribute('label', multiple ? "Rename Files from Parent Metadata" : "Rename File from Parent Metadata");
+		menu.childNodes[m.renameAttachments].setAttribute('label', Zotero.getString('pane.items.menu.renameAttachments' + multiple));
 		menu.childNodes[m.reindexItem].setAttribute('label', Zotero.getString('pane.items.menu.reindexItem' + multiple));
 		
 		for (var i in disable)
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index b6f703143d..8a9c58c68d 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -67,12 +67,11 @@
 				<menuitem id="zotero-context-add-to-new-note" class="menu-iconic"
 					label="&zotero.contextMenu.addTextToNewNote;" hidden="true"
 					oncommand="var str = event.currentTarget.ownerDocument.popupNode.ownerDocument.defaultView.getSelection().toString(); var uri = event.currentTarget.ownerDocument.popupNode.ownerDocument.location.href; var itemID = ZoteroPane.addItemFromPage(); ZoteroPane.newNote(false, itemID, str, uri)"/>
-				<!-- TODO: localize and remove zotero.contextMenu.saveLinkAsItem/saveImageAsSnapshot -->
 				<menuitem id="zotero-context-save-link-as-item" class="menu-iconic"
-					label="Save Link as Zotero Item" hidden="true"
+					label="&zotero.contextMenu.saveLinkAsItem;" hidden="true"
 					oncommand="ZoteroPane.addItemFromURL(window.gContextMenu.linkURL, 'temporaryPDFHack')"/>
 				<menuitem id="zotero-context-save-image-as-item" class="menu-iconic"
-					label="Save Image as Zotero Item" hidden="true"
+					label="&zotero.contextMenu.saveImageAsItem;" hidden="true"
 					oncommand="ZoteroPane.addItemFromURL(window.gContextMenu.onImage ? (window.gContextMenu.mediaURL ? window.gContextMenu.mediaURL : window.gContextMenu.imageURL) : window.gContextMenu.bgImageURL, 'artwork')"/>
 			</menupopup>
 		</menu>
@@ -117,13 +116,12 @@
 					<menuseparator/>
 					<!-- with icon: <menuitem class="menuitem-iconic" id="zotero-menuitem-note" label="&zotero.items.menu.attach.note;" oncommand="ZoteroPane.newNote(false, this.parentNode.getAttribute('itemID'))"/>-->
 					<menuitem label="&zotero.items.menu.attach.note;" oncommand="ZoteroPane.newNote(false, this.parentNode.getAttribute('itemID'))"/>
-					<!-- TODO: localize -->
-					<menu label="Add Attachment">
+					<menu label="&zotero.items.menu.attach;">
 						<menupopup id="zotero-add-attachment-popup">
 							<menuitem class="menuitem-iconic zotero-menuitem-attachments-snapshot" label="&zotero.items.menu.attach.snapshot;" oncommand="var itemID = parseInt(this.parentNode.parentNode.parentNode.getAttribute('itemID')); ZoteroPane.addAttachmentFromPage(false, itemID)"/>
 							<menuitem class="menuitem-iconic zotero-menuitem-attachments-web-link" label="&zotero.items.menu.attach.link;" oncommand="var itemID = parseInt(this.parentNode.parentNode.parentNode.getAttribute('itemID')); ZoteroPane.addAttachmentFromPage(true, itemID)"/>
-							<menuitem class="menuitem-iconic zotero-menuitem-attachments-file" label="Attach Stored Copy of File..." oncommand="var itemID = parseInt(this.parentNode.parentNode.parentNode.getAttribute('itemID')); ZoteroPane.addAttachmentFromDialog(false, itemID);"/>
-							<menuitem class="menuitem-iconic zotero-menuitem-attachments-link" label="Attach Link to File..." oncommand="var itemID = parseInt(this.parentNode.parentNode.parentNode.getAttribute('itemID')); ZoteroPane.addAttachmentFromDialog(true, itemID);"/>
+							<menuitem class="menuitem-iconic zotero-menuitem-attachments-file" label="&zotero.items.menu.attach.file;" oncommand="var itemID = parseInt(this.parentNode.parentNode.parentNode.getAttribute('itemID')); ZoteroPane.addAttachmentFromDialog(false, itemID);"/>
+							<menuitem class="menuitem-iconic zotero-menuitem-attachments-link" label="&zotero.items.menu.attach.fileLink;" oncommand="var itemID = parseInt(this.parentNode.parentNode.parentNode.getAttribute('itemID')); ZoteroPane.addAttachmentFromDialog(true, itemID);"/>
 						</menupopup>
 					</menu>
 					<menuseparator/>
@@ -399,8 +397,7 @@
 								onpopupshowing="Zotero.Sync.Runner.registerSyncStatusLabel(this.firstChild.nextSibling)"
 								onpopuphiding="Zotero.Sync.Runner.registerSyncStatusLabel()"
 								noautohide="true">
-							<!-- TODO: localize -->
-							<label value="Sync with Zotero Server"/>
+							<label value="&zotero.sync.button;"/>
 							<label id="zotero-tb-sync-status"/>
 						</tooltip>
 					</toolbarbutton>
diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js
index 979ee1f78b..8236d26fd0 100644
--- a/chrome/content/zotero/preferences/preferences.js
+++ b/chrome/content/zotero/preferences/preferences.js
@@ -1492,12 +1492,11 @@ Zotero_Preferences.Debug_Output = {
 		var storing = Zotero.Debug.storing
 		
 		var button = document.getElementById('debug-output-enable');
-		// TODO: localize
 		if (storing) {
-			button.label = "Disable";
+			button.label = Zotero.getString('general.disable');
 		}
 		else {
-			button.label = "Enable";
+			button.label = Zotero.getString('general.enable');
 		}
 	},
 	
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index 2c3f9b844d..0d9230fc34 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -97,9 +97,8 @@ To add a new preference:
 					</row>
 					
 					<row>
-						<!-- TODO: localize -->
 						<hbox align="center">
-							<label value="Note font size:" control="noteFontSize"/>
+							<label value="&zotero.preferences.fontSize.notes;" control="noteFontSize"/>
 						</hbox>
 						<hbox>
 							<menulist id="noteFontSize" preference="pref-noteFontSize" editable="true">
@@ -144,14 +143,13 @@ To add a new preference:
 		</groupbox>
 		
 		<groupbox>
-			<caption label="Groups"/>
+			<caption label="&zotero.preferences.groups;"/>
 			
-			<!-- TODO: localize -->
-			<label value="When copying items between libraries, include:"/>
+			<label value="&zotero.preferences.groups.whenCopyingInclude;"/>
 			<vbox style="margin-left: 2em">
-				<checkbox label="child notes" preference="pref-groups-copyChildNotes"/>
-				<checkbox label="child snapshots and imported files" preference="pref-groups-copyChildFileAttachments"/>
-				<checkbox label="child links" preference="pref-groups-copyChildLinks"/>
+				<checkbox label="&zotero.preferences.groups.childNotes;" preference="pref-groups-copyChildNotes"/>
+				<checkbox label="&zotero.preferences.groups.childFiles;" preference="pref-groups-copyChildFileAttachments"/>
+				<checkbox label="&zotero.preferences.groups.childLinks;" preference="pref-groups-copyChildLinks"/>
 			</vbox>
 		</groupbox>
 		
@@ -159,9 +157,8 @@ To add a new preference:
 	</prefpane>
 	
 	
-	<!-- localize -->
 	<prefpane id="zotero-prefpane-sync"
-						label="Sync"
+						label="&zotero.preferences.prefpane.sync;"
 						onpaneload="document.getElementById('sync-password').value = Zotero.Sync.Server.password; document.getElementById('storage-password').value = Zotero.Sync.Storage.password;"
 						image="chrome://zotero/skin/prefs-sync.png">
 		<preferences>
@@ -196,7 +193,7 @@ To add a new preference:
 			<tabpanels>
 				<tabpanel orient="vertical">
 					<groupbox>
-						<caption label="Zotero Sync Server"/>
+						<caption label="&zotero.preferences.sync.syncServer;"/>
 						
 						<hbox>
 							<grid>
@@ -207,12 +204,12 @@ To add a new preference:
 								
 								<rows>
 									<row>
-										<label value="Username:"/>
+										<label value="&zotero.preferences.sync.username;"/>
 										<textbox preference="pref-sync-username"
 											onchange="Zotero.Prefs.set('sync.server.username', this.value); var pass = document.getElementById('sync-password'); if (pass.value) { Zotero.Sync.Server.password = pass.value; }"/>
 									</row>
 									<row>
-										<label value="Password:"/>
+										<label value="&zotero.preferences.sync.password;"/>
 										<textbox id="sync-password" type="password"
 											onchange="Zotero.Sync.Server.password = this.value"/>
 									</row>
@@ -231,27 +228,26 @@ To add a new preference:
 							<hbox style="width:2em"/>
 							
 							<vbox>
-								<label class="text-link" value="Create Account" href="http://zotero.org/user/register"/>
+								<label class="text-link" value="&zotero.preferences.sync.createAccount;" href="http://zotero.org/user/register"/>
 								<separator class="thin"/>
-								<label class="text-link" value="Lost Password?" href="http://zotero.org/user/lostpassword"/>
+								<label class="text-link" value="&zotero.preferences.sync.lostPassword;" href="http://zotero.org/user/lostpassword"/>
 							</vbox>
 						</hbox>
 						
 						<separator class="thin"/>
 						
 						<hbox>
-							<checkbox label="Sync automatically" preference="pref-sync-autosync"/>
+							<checkbox label="&zotero.preferences.sync.syncAutomatically;" preference="pref-sync-autosync"/>
 						</hbox>
 					</groupbox>
 					
 					
-					<!-- TODO: localize -->
 					<groupbox>
-						<caption label="File Syncing"/>
+						<caption label="&zotero.preferences.sync.fileSyncing;"/>
 						
 						<!-- My Library -->
 						<hbox style="margin: 0">
-							<checkbox label="Sync attachment files in My Library using" preference="pref-storage-enabled" oncommand="updateStorageSettings(this.checked, null)"/>
+							<checkbox label="&zotero.preferences.sync.fileSyncing.myLibrary;" preference="pref-storage-enabled" oncommand="updateStorageSettings(this.checked, null)"/>
 							<menulist id="storage-protocol" style="margin-left: .5em" preference="pref-storage-protocol" oncommand="updateStorageSettings(null, this.value)">
 								<menupopup>
 									<menuitem label="Zotero" value="zotero"/>
@@ -272,7 +268,7 @@ To add a new preference:
 							
 							<rows>
 								<row>
-									<label value="URL:"/>
+									<label value="&zotero.preferences.sync.fileSyncing.url;"/>
 									<hbox>
 										<menulist id="storage-url-prefix"
 												preference="pref-storage-scheme"
@@ -292,7 +288,7 @@ To add a new preference:
 									</hbox>
 								</row>
 								<row>
-									<label value="Username:"/>
+									<label value="&zotero.preferences.sync.username;"/>
 									<hbox>
 										<textbox id="storage-username"
 											preference="pref-storage-username"
@@ -302,7 +298,7 @@ To add a new preference:
 									</hbox>
 								</row>
 								<row>
-									<label value="Password:"/>
+									<label value="&zotero.preferences.sync.password;"/>
 									<hbox>
 										<textbox id="storage-password" flex="0" type="password"
 											onkeypress="if (Zotero.isMac &amp;&amp; event.keyCode == 13) { this.blur(); setTimeout('verifyStorageServer();', 1); }"
@@ -328,17 +324,17 @@ To add a new preference:
 						<separator id="storage-separator" class="thin"/>
 						
 						<!-- Group Libraries -->
-						<checkbox label="Sync attachment files in group libraries using Zotero storage"
+						<checkbox label="&zotero.preferences.sync.fileSyncing.groups;"
 								preference="pref-group-storage-enabled" oncommand="setTimeout(function () { updateStorageTerms(); }, 1)"/>
 						
 						<separator class="thin"/>
 						
 						<vbox>
-							<label class="text-link" style="margin-top:.3em; margin-left: 0" value="About File Syncing" href="http://zotero.org/support/file_sync"/>
+							<label class="text-link" style="margin-top:.3em; margin-left: 0" value="&zotero.preferences.sync.fileSyncing.about;" href="http://zotero.org/support/file_sync"/>
 							<hbox id="storage-terms" style="margin-top: .4em" align="center">
-								<label>By using Zotero storage, you agree to become bound by its</label>
-								<label class="text-link" href="http://www.digitalscholar.org/z_terms" value="terms and conditions"/>
-								<label>.</label>
+								<label>&zotero.preferences.sync.fileSyncing.tos1;</label>
+								<label class="text-link" href="http://www.digitalscholar.org/z_terms" value="&zotero.preferences.sync.fileSyncing.tos2;"/>
+								<label>&zotero.preferences.period;</label>
 							</hbox>
 						</vbox>
 					</groupbox>
@@ -347,8 +343,7 @@ To add a new preference:
 				<tabpanel id="zotero-reset" orient="vertical">
 					<radiogroup id="zotero-reset-sync-group" oncommand="handleSyncResetSelect(this)">
 						<groupbox>
-							<!-- TODO: localize -->
-							<caption label="Zotero Sync Server"/>
+							<caption label="&zotero.preferences.sync.syncServer;"/>
 							
 							<grid>
 								<columns>
@@ -360,24 +355,24 @@ To add a new preference:
 									<row id="zotero-full-sync">
 									<radio/>
 										<vbox onclick="this.previousSibling.click()">
-											<label value="Full Sync with Zotero Server"/>
-											<description>Merge local Zotero data with data from the sync server, ignoring sync history.</description>
+											<label value="&zotero.preferences.sync.reset.fullSync;"/>
+											<description>&zotero.preferences.sync.reset.fullSync.desc;</description>
 										</vbox>
 									</row>
 									
 									<row id="zotero-restore-from-server" selected="true">
 										<radio/>
 										<vbox onclick="this.previousSibling.click()">
-											<label value="Restore from Zotero Server"/>
-											<description>Erase all local Zotero data and restore from the sync server.</description>
+											<label value="&zotero.preferences.sync.reset.restoreFromServer;"/>
+											<description>&zotero.preferences.sync.reset.restoreFromServer.desc;</description>
 										</vbox>
 									</row>
 									
 									<row id="zotero-restore-to-server">
 										<radio/>
 										<vbox onclick="this.previousSibling.click()">
-											<label value="Restore to Zotero Server"/>
-											<description>Erase all server data and overwrite with local Zotero data.</description>
+											<label value="&zotero.preferences.sync.reset.restoreToServer;"/>
+											<description>&zotero.preferences.sync.reset.restoreToServer.desc;</description>
 										</vbox>
 									</row>
 								</rows>
@@ -385,7 +380,7 @@ To add a new preference:
 						</groupbox>
 						
 						<groupbox>
-							<caption label="File Syncing"/>
+							<caption label="&zotero.preferences.sync.fileSyncing;"/>
 							
 							<grid>
 								<columns>
@@ -397,8 +392,8 @@ To add a new preference:
 									<row id="zotero-reset-storage-history">
 									<radio/>
 										<vbox onclick="this.previousSibling.click()">
-											<label value="Reset File Sync History"/>
-											<description>Force checking of the storage server for all local attachment files.</description>
+											<label value="&zotero.preferences.sync.reset.resetFileSyncHistory;"/>
+											<description>&zotero.preferences.sync.reset.resetFileSyncHistory.desc;</description>
 										</vbox>
 									</row>
 								</rows>
@@ -407,7 +402,7 @@ To add a new preference:
 					</radiogroup>
 					
 					<hbox>
-						<button id="zotero-reset-button" label="Reset..." oncommand="handleSyncReset(document.getElementById('zotero-reset-sync-group').selectedItem.parentNode.id.substr(7))"/>
+						<button id="zotero-reset-button" label="&zotero.preferences.sync.reset.button;" oncommand="handleSyncReset(document.getElementById('zotero-reset-sync-group').selectedItem.parentNode.id.substr(7))"/>
 					</hbox>
 				</tabpanel>
 			</tabpanels>
@@ -549,11 +544,10 @@ To add a new preference:
 				<button label="+" onclick="showQuickCopySiteEditor()"/>
 			</hbox>
 			
-			<!-- TODO: localize -->
 			<hbox align="center">
-				<label value="Disable Quick Copy when dragging more than"/>
+				<label value="&zotero.preferences.quickCopy.dragLimit;"/>
 				<textbox preference="pref-quickCopy-dragLimit" size="3"/>
-				<label value="items" flex="1"/>
+				<label value="&zotero.preferences.items;" flex="1"/>
 			</hbox>
 		</groupbox>
 		
@@ -762,8 +756,7 @@ To add a new preference:
 		</preferences>
 		
 		<groupbox>
-			<!-- TODO: localize with &zotero.preferences.dataDir; -->
-			<caption label="Data Directory Location"/>
+			<caption label="&zotero.preferences.dataDir;"/>
 			
 			<radiogroup id="dataDir" preference="pref-useDataDir" onsyncfrompreference="onDataDirLoad();" onsynctopreference="return onDataDirUpdate(event);">
 				<radio label="&zotero.preferences.dataDir.useProfile;" value="false"/>
@@ -789,25 +782,24 @@ To add a new preference:
 		</groupbox>
 		
 		<groupbox>
-			<!-- TODO: localize -->
-			<caption label="Debug Output Logging"/>
+			<caption label="&zotero.preferences.debugOutputLogging;"/>
 			
 			<!-- This doesn't wrap without an explicit width -->
 			<vbox>
-				<description width="45em">Debug output can help Zotero developers diagnose problems in Zotero. Debug logging will slow down Zotero, so you should generally leave it disabled unless a Zotero developer requests debug output.</description>
+				<description width="45em">&zotero.preferences.debugOutputLogging.message;</description>
 			</vbox>
 			
 			<hbox align="center">
 				<button id="debug-output-enable" oncommand="Zotero_Preferences.Debug_Output.toggleStore()"/>
 				<label id="debug-output-lines" style="margin-right: 0"/>
-				<label value="lines logged"/>
-				<checkbox preference="pref-debug-output-enableAfterRestart" label="Enable after restart" style="margin-left: 1.5em"/>
+				<label value="&zotero.preferences.debugOutputLogging.linesLogged;"/>
+				<checkbox preference="pref-debug-output-enableAfterRestart" label="&zotero.preferences.debugOutputLogging.enableAfterRestart;" style="margin-left: 1.5em"/>
 			</hbox>
 			
 			<hbox align="center">
-				<button id="debug-output-view" label="View Output" oncommand="Zotero_Preferences.Debug_Output.view()"/>
-				<button id="debug-output-clear" label="Clear Output" oncommand="Zotero_Preferences.Debug_Output.clear()"/>
-				<button id="debug-output-submit" label="Submit to Zotero Server" oncommand="Zotero_Preferences.Debug_Output.submit()"/>
+				<button id="debug-output-view" label="&zotero.preferences.debugOutputLogging.viewOutput;" oncommand="Zotero_Preferences.Debug_Output.view()"/>
+				<button id="debug-output-clear" label="&zotero.preferences.debugOutputLogging.clearOutput;" oncommand="Zotero_Preferences.Debug_Output.clear()"/>
+				<button id="debug-output-submit" label="&zotero.preferences.debugOutputLogging.submitToServer;" oncommand="Zotero_Preferences.Debug_Output.submit()"/>
 				<progressmeter id="debug-output-submit-progress" mode="undetermined" hidden="true"/>
 			</hbox>
 		</groupbox>
diff --git a/chrome/content/zotero/xpcom/ingester.js b/chrome/content/zotero/xpcom/ingester.js
index 0004f15974..47ee548405 100644
--- a/chrome/content/zotero/xpcom/ingester.js
+++ b/chrome/content/zotero/xpcom/ingester.js
@@ -30,8 +30,9 @@ Zotero.Ingester = new function() {
 		
 		if (Zotero.locked) {
 			frontWindow.Zotero_Browser.progress.changeHeadline(Zotero.getString("ingester.scrapeError"));
-			// TODO: localize
-			var desc = "A Zotero operation is currently in progress. Please wait until it finishes and try again.";
+			var desc = Zotero.localeJoin([
+				Zotero.getString('general.operationInProgress'), Zotero.getString('general.operationInProgress.waitUntilFinishedAndTryAgain')
+			]);
 			frontWindow.Zotero_Browser.progress.addDescription(desc);
 			frontWindow.Zotero_Browser.progress.show();
 			frontWindow.Zotero_Browser.progress.startCloseTimer(8000);
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
index 79499021a7..c423d68092 100644
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@@ -2577,14 +2577,10 @@ Zotero.Schema = new function(){
 			//
 			// Conditional should be same as in showUpgradeWizard()
 			if (e.name && e.name == "NS_ERROR_FAILURE" && e.message.match(/nsIFile\.moveTo/)) {
-				// TODO: localize
 				var pr = Components.classes["@mozilla.org/network/default-prompt;1"]
 							.getService(Components.interfaces.nsIPrompt);
-				var title = "Upgrade Failed";
-				var couldNotMigrate = "Zotero could not migrate all necessary files.";
-				var closeAttachmentFiles = "Please close any open attachment files and restart Firefox to try the upgrade again.";
-				var restartYourComputer = "If you continue to receive this message, restart your computer.";
-				pr.alert(title, Zotero.localeJoin([couldNotMigrate, closeAttachmentFiles]) + "\n\n" + restartYourComputer);
+				var title = Zotero.getString('upgrade.failed.title');
+				pr.alert(title, Zotero.getString('upgrade.couldNotMigrate') + "\n\n" + Zotero.getString('upgrade.couldNotMigrate.restart'));
 			}
 			
 			throw(e);
diff --git a/chrome/content/zotero/xpcom/storage.js b/chrome/content/zotero/xpcom/storage.js
index 8705fe8889..07ae2fed93 100644
--- a/chrome/content/zotero/xpcom/storage.js
+++ b/chrome/content/zotero/xpcom/storage.js
@@ -127,12 +127,10 @@ Zotero.Sync.Storage = new function () {
 					Zotero.debug(_session.name + " verification failed");
 					
 					var e = new Zotero.Error(
-						_session.name + " verification failed. Verify your "
-							+ "WebDAV settings in the Sync pane of the Zotero preferences.",
+						Zotero.getString('sync.storage.error.verificationFailed', _session.name),
 						0,
 						{
-							// TODO: localize
-							dialogButtonText: "Open Sync Preferences...",
+							dialogButtonText: Zotero.getString('sync.openSyncPreferences'),
 							dialogButtonCallback: function () {
 								var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
 										   .getService(Components.interfaces.nsIWindowMediator);
@@ -1178,11 +1176,7 @@ Zotero.Sync.Storage = new function () {
 				catch (e) {
 					if (e.name == 'NS_ERROR_FILE_ACCESS_DENIED') {
 						Zotero.debug(e);
-						
-						// TODO: localize
-						var msg = "The file '" + file.leafName + "' is in use and cannot "
-							+ "be updated. Please close the file or restart your computer "
-							+ "and try syncing again.";
+						var msg = Zotero.getString('sync.storage.error.fileInUse', file.leafName);
 						throw (msg);
 					}
 					
@@ -1440,15 +1434,11 @@ Zotero.Sync.Storage = new function () {
 								+ pr.BUTTON_DELAY_ENABLE;
 				var index = pr.confirmEx(
 					Zotero.getString('general.warning'),
-					// TODO: localize
-					"You no longer have file editing access to the Zotero group '" + group.name + "', "
-						+ "and files you've added or edited cannot be synced to the server.\n\n"
-						+ "If you continue, your copy of the group will be reset to its state "
-						+ "on the server, and local modifications to items and files will be lost.\n\n"
-						+ "If you would like a chance to copy changed items and files elsewhere, "
-						+ "cancel the sync now.",
+					Zotero.getString('sync.storage.error.fileEditingAccessLost', group.name) + "\n\n"
+						+ Zotero.getString('sync.error.groupWillBeReset') + "\n\n"
+						+ Zotero.getString('sync.error.copyChangedItems'),
 					buttonFlags,
-					"Reset Group and Sync",
+					Zotero.getString('sync.resetGroupAndSync'),
 					null, null, null, {}
 					);
 				
@@ -1671,15 +1661,10 @@ Zotero.Sync.Storage.QueueManager = new function () {
 			Zotero.Utilities.prototype.numberFormat(remaining / 1024, 0)
 		);
 		var totalRequests = queue.totalRequests;
-		// TODO: localize
-		/*
 		var filesRemaining = Zotero.getString(
 			'sync.storage.filesRemaining',
 			[totalRequests - unfinishedRequests, totalRequests]
 		);
-		*/
-		var filesRemaining = (totalRequests - unfinishedRequests)
-								+ "/" + totalRequests + " files";
 		var status = Zotero.localeJoin([kbRemaining, '(' + filesRemaining + ')']);
 		return status;
 	}
@@ -1702,10 +1687,9 @@ Zotero.Sync.Storage.QueueManager = new function () {
 			dataIn: {
 				type: 'storagefile',
 				captions: [
-					// TODO: localize
-					'Local File',
-					'Remote File',
-					'Saved File'
+					Zotero.getString('sync.storage.localFile'),
+					Zotero.getString('sync.storage.RemoteFile'),
+					Zotero.getString('sync.storage.savedFile')
 				],
 				objects: objectPairs
 			}
diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js
index bf0eb34f32..09384f20cd 100644
--- a/chrome/content/zotero/xpcom/storage/webdav.js
+++ b/chrome/content/zotero/xpcom/storage/webdav.js
@@ -574,12 +574,14 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._onUploadComplete = function (httpR
 			break;
 		
 		case 403:
-			this.onError("File upload failed. Please verify your WebDAV server "
-				+ "from the Sync pane of the Zotero preferences.");
+			this.onError(Zotero.localeJoin([
+				Zotero.getString('sync.storage.error.fileUploadFailed'),
+				Zotero.getString('sync.storage.error.checkFileSyncSettings')
+			]));
 			return;
 		
 		case 507:
-			this.onError("A file upload failed due to insufficient space on the WebDAV server.");
+			this.onError(Zotero.getString('sync.storage.error.webDAVInsufficientSpace'));
 			return;
 		
 		default:
@@ -1002,62 +1004,62 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.checkServerCallback = function (uri
 			if (!skipSuccessMessage) {
 				promptService.alert(
 					window,
-					"Server configuration verified",
-					"File storage is successfully set up."
+					Zotero.getString('sync.storage.serverConfigurationVerified'),
+					Zotero.getString('sync.storage.fileSyncSetUp')
 				);
 			}
 			Zotero.Prefs.set("sync.storage.verified", true);
 			return true;
 		
 		case Zotero.Sync.Storage.ERROR_NO_URL:
-			var errorMessage = "Please enter a WebDAV URL.";
+			var errorMessage = Zotero.getString('sync.storage.error.enterWebDAVURL');
 			break;
 		
 		case Zotero.Sync.Storage.ERROR_NO_PASSWORD:
-			var errorMessage = "Please enter a password.";
+			var errorMessage = Zotero.getString('sync.error.enterPassword');
 			break;
 		
 		case Zotero.Sync.Storage.ERROR_UNREACHABLE:
-			var errorMessage = "The server " + uri.host + " could not be reached.";
+			var errorMessage = Zotero.getString('sync.storage.error.serverCouldNotBeReached', uri.host);
 			break;
 		
 		case Zotero.Sync.Storage.ERROR_NOT_DAV:
-			var errorMessage = spec + " is not a valid WebDAV URL.";
+			var errorMessage = Zotero.getString('sync.storage.error.webDAVInvalidURL', spec);
 			break;
 		
 		case Zotero.Sync.Storage.ERROR_AUTH_FAILED:
-			var errorTitle = "Permission denied";
-			var errorMessage = "The WebDAV server did not accept the "
-				+ "username and password you entered." + " "
-				+ "Please check your storage settings "
-				+ "or contact your server administrator.";
+			var errorTitle = Zotero.getString('general.permissionDenied');
+			var errorMessage = Zotero.localeJoin([
+				Zotero.getString('sync.storage.error.webDAVInvalidLogin'),
+				Zotero.getString('sync.storage.error.checkFileSyncSettings')
+			]);
 			break;
 		
 		case Zotero.Sync.Storage.ERROR_FORBIDDEN:
-			var errorTitle = "Permission denied";
-			var errorMessage = "You don't have permission to access "
-				+ uri.path + " on the WebDAV server." + " "
-				+ "Please check your file sync settings "
-				+ "or contact your server administrator.";
+			var errorTitle = Zotero.getString('general.permissionDenied');
+			var errorMessage = Zotero.localeJoin([
+				Zotero.getString('sync.storage.error.webDAVPermissionDenied', uri.path),
+				Zotero.getString('sync.storage.error.checkFileSyncSettings')
+			]);
 			break;
 		
 		case Zotero.Sync.Storage.ERROR_PARENT_DIR_NOT_FOUND:
-			var errorTitle = "Directory not found";
+			var errorTitle = Zotero.getString('sync.storage.error.directoryNotFound');
 			var parentSpec = spec.replace(/\/zotero\/$/, "");
-			var errorMessage = parentSpec + " does not exist.";
+			var errorMessage = Zotero.getString('sync.storage.error.doesNotExist', parentSpec);
 			break;
 		
 		case Zotero.Sync.Storage.ERROR_ZOTERO_DIR_NOT_FOUND:
 			var create = promptService.confirmEx(
 				window,
-				// TODO: localize
-				"Directory not found",
-				spec + " does not exist.\n\nDo you want to create it now?",
+				Zotero.getString('sync.storage.error.directoryNotFound'),
+				Zotero.getString('sync.storage.error.doesNotExist', spec) + "\n\n"
+					+ Zotero.getString('sync.storage.error.createNow'),
 				promptService.BUTTON_POS_0
 					* promptService.BUTTON_TITLE_IS_STRING
 				+ promptService.BUTTON_POS_1
 					* promptService.BUTTON_TITLE_CANCEL,
-				"Create",
+				Zotero.getString('general.create'),
 				null, null, null, {}
 			);
 			
@@ -1071,21 +1073,18 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.checkServerCallback = function (uri
 						if (!skipSuccessMessage) {
 							promptService.alert(
 								window,
-								"Server configuration verified",
-								"File sync is successfully set up."
+								Zotero.getString('sync.storage.serverConfigurationVerified'),
+								Zotero.getString('sync.storage.fileSyncSetUp')
 							);
 						}
 						Zotero.Prefs.set("sync.storage.verified", true);
 						return true;
 					
 					case Zotero.Sync.Storage.ERROR_FORBIDDEN:
-						var errorTitle = "Permission denied";
-						var errorMessage = "You do not have "
-							+ "permission to create a Zotero directory "
-							+ "at the following address:" + "\n\n" + spec;
-						errorMessage += "\n\n"
-							+ "Please check your file sync settings or "
-							+ "contact your server administrator.";
+						var errorTitle = Zotero.getString('general.permissionDenied');
+						var errorMessage = Zotero.getString('sync.storage.error.permissionDeniedAtAddress') + "\n\n"
+							+ spec + "\n\n"
+							+ Zotero.getString('sync.storage.error.checkFileSyncSettings');
 						break;
 				}
 				
@@ -1099,7 +1098,10 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.checkServerCallback = function (uri
 			return false;
 		
 		case Zotero.Sync.Storage.ERROR_UNKNOWN:
-			var errorMessage = "An unknown error occurred. Check your WebDAV settings and server configuration.";
+			var errorMessage = Zotero.localeJoin([
+				Zotero.getString('general.unknownErrorOccurred'),
+				Zotero.getString('sync.storage.error.checkFileSyncSettings')
+			]);
 			break;
 	}
 	
@@ -1524,15 +1526,19 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._checkResponse = function (req, obj
 				Zotero.debug(e);
 			}
 			
-			var msg = "SSL certificate error connecting to " + host + ". "
-				+ "Load your WebDAV URL in your browser for more information.";
+			var msg = Zotero.localeString([
+				Zotero.getString('sync.storage.error.webDAVSSLCertificateError'),
+				Zotero.getString('sync.storage.error.webDAVLoadURLForMoreInfo')
+			]);
 			
 			obj.onError(msg);
 			return;
 		}
 		else if ((secInfo.securityState & Ci.nsIWebProgressListener.STATE_IS_BROKEN) == Ci.nsIWebProgressListener.STATE_IS_BROKEN) {
-			var msg = "SSL connection error connecting to " + host + ". "
-				+ "Load your WebDAV URL in your browser for more information.";
+			var msg = Zotero.localeString([
+				Zotero.getString('sync.storage.error.webDAVSSLConnectionError'),
+				Zotero.getString('sync.storage.error.webDAVLoadURLForMoreInfo')
+			]);
 			obj.onError(msg);
 			return;
 		}
diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js
index 47f6a772a6..32b8a978c8 100644
--- a/chrome/content/zotero/xpcom/sync.js
+++ b/chrome/content/zotero/xpcom/sync.js
@@ -523,8 +523,7 @@ Zotero.Sync.Runner = new function () {
 		var storageSync = function () {
 			var syncNeeded = false;
 			
-			// TODO: localize
-			Zotero.Sync.Runner.setSyncStatus("Syncing files");
+			Zotero.Sync.Runner.setSyncStatus(Zotero.getString('sync.status.syncingFiles'));
 			
 			Zotero.Sync.Storage.sync(
 				'webdav',
@@ -832,8 +831,7 @@ Zotero.Sync.Runner = new function () {
 					}
 					
 					if (typeof buttonText == 'undefined') {
-						// TODO: localize
-						buttonText = "Report Error...";
+						buttonText = Zotero.getString('errorReport.reportError');
 						buttonCallback = function () {
 							win.ZoteroPane.reportErrors();
 						}
@@ -910,15 +908,18 @@ Zotero.Sync.Runner = new function () {
 		// If no message, use last sync time
 		else {
 			var lastSyncTime = Zotero.Sync.Server.lastLocalSyncTime;
-			// TODO: localize
-			var msg = 'Last sync: ';
 			if (lastSyncTime) {
 				var time = new Date(lastSyncTime * 1000);
-				msg += Zotero.Date.toRelativeDate(time);
+				var msg = Zotero.Date.toRelativeDate(time);
 			}
 			else {
-				msg += 'Not yet synced';
+				var msg = Zotero.getString('sync.status.notYetSynced');
 			}
+			
+			msg = Zotero.localeJoin([
+				Zotero.getString('sync.status.lastSync'),
+				msg
+			]);
 		}
 		
 		_currentSyncStatusLabel.value = msg;
@@ -1059,12 +1060,8 @@ Zotero.Sync.Server = new function () {
 		}
 		catch (e) {
 			Zotero.debug(e);
-			// TODO: localize
-			var msg = "Zotero cannot access your login information, "
-						+ "likely due to a corrupted Firefox login manager database."
-						+ "\n\n"
-						+ "Close Firefox, back up and delete signons.* from your Firefox profile, "
-						+ "and re-enter your Zotero login information in the Sync pane of the Zotero preferences.";
+			var msg = Zotero.getString('sync.error.loginManagerCorrupted1') + "\n\n"
+						+ Zotero.getString('sync.error.loginManagerCorrupted2');
 			alert(msg);
 			return '';
 		}
@@ -1172,15 +1169,13 @@ Zotero.Sync.Server = new function () {
 		
 		var username = Zotero.Sync.Server.username;
 		if (!username) {
-			// TODO: localize
-			var e = new Zotero.Error("Username not set", "SYNC_USERNAME_NOT_SET");
+			var e = new Zotero.Error(Zotero.getString('sync.error.usernameNotSet'), "SYNC_USERNAME_NOT_SET");
 			_error(e);
 		}
 		
 		var password = Zotero.Sync.Server.password;
 		if (!password) {
-			// TODO: localize
-			var e = new Zotero.Error("Password not set", "INVALID_SYNC_LOGIN");
+			var e = new Zotero.Error(Zotero.getString('sync.error.passwordNotSet'), "INVALID_SYNC_LOGIN");
 			_error(e);
 		}
 		
@@ -1190,8 +1185,7 @@ Zotero.Sync.Server = new function () {
 					+ "&username=" + username
 					+ "&password=" + password;
 		
-		// TODO: localize
-		Zotero.Sync.Runner.setSyncStatus("Logging in to sync server");
+		Zotero.Sync.Runner.setSyncStatus(Zotero.getString('sync.status.loggingIn'));
 		
 		Zotero.Utilities.HTTP.doPost(url, body, function (xmlhttp) {
 			_checkResponse(xmlhttp);
@@ -1200,8 +1194,7 @@ Zotero.Sync.Server = new function () {
 			
 			if (response.firstChild.tagName == 'error') {
 				if (response.firstChild.getAttribute('code') == 'INVALID_LOGIN') {
-					// TODO: localize
-					var e = new Zotero.Error("Invalid login/pass", "INVALID_SYNC_LOGIN");
+					var e = new Zotero.Error(Zotero.getString('sync.error.invalidLogin'), "INVALID_SYNC_LOGIN");
 					_error(e);
 				}
 				_error(response.firstChild.firstChild.nodeValue);
@@ -1249,8 +1242,10 @@ Zotero.Sync.Server = new function () {
 		
 		if (!restart) {
 			if (_syncInProgress) {
-				// TODO: localize
-				_error("A sync operation is already in progress. Wait for the previous sync to complete or restart Firefox.");
+				_error(Zotero.localeJoin([
+					Zotero.getString('sync.error.syncInProgress'),
+					Zotero.getString('sync.error.syncInProgress.wait')
+				]));
 			}
 			
 			Zotero.debug("Beginning server sync");
@@ -1273,8 +1268,7 @@ Zotero.Sync.Server = new function () {
 			body += '&upload=1';
 		}
 		
-		// TODO: localize
-		Zotero.Sync.Runner.setSyncStatus("Getting updated data from sync server");
+		Zotero.Sync.Runner.setSyncStatus(Zotero.getString('sync.status.gettingUpdatedData'));
 		
 		Zotero.Utilities.HTTP.doPost(url, body, function (xmlhttp) {
 			Zotero.debug(xmlhttp.responseText);
@@ -1360,8 +1354,7 @@ Zotero.Sync.Server = new function () {
 				var nextLocalSyncTime = Zotero.Date.toUnixTimestamp(nextLocalSyncDate);
 				Zotero.Sync.Server.nextLocalSyncDate = nextLocalSyncDate;
 				
-				// TODO: localize
-				Zotero.Sync.Runner.setSyncStatus("Processing updated data");
+				Zotero.Sync.Runner.setSyncStatus(Zotero.getString('sync.status.processingUpdatedData'));
 				
 				// Reconcile and save updated data from server and
 				// prepare local data to upload
@@ -1400,8 +1393,7 @@ Zotero.Sync.Server = new function () {
 				
 				Zotero.DB.commitTransaction();
 				
-				// TODO: localize
-				Zotero.Sync.Runner.setSyncStatus("Uploading data to sync server");
+				Zotero.Sync.Runner.setSyncStatus(Zotero.getString('sync.status.uploadingData'));
 				
 				var url = _serverURL + 'upload';
 				var body = _apiVersionComponent
@@ -1431,8 +1423,7 @@ Zotero.Sync.Server = new function () {
 						switch (mode) {
 							// If the upload was queued, keep checking back
 							case 'queued':
-								// TODO: localize
-								Zotero.Sync.Runner.setSyncStatus("Upload accepted \u2014 waiting for sync server");
+								Zotero.Sync.Runner.setSyncStatus(Zotero.getString('sync.status.uploadAccepted'));
 								
 								var url = _serverURL + 'uploadstatus';
 								var body = _apiVersionComponent
@@ -1705,7 +1696,6 @@ Zotero.Sync.Server = new function () {
 			else {
 				var timeStr = time.toLocaleString();
 			}
-			// TODO: localize
 			_error("Auto-syncing disabled until " + timeStr);
 		}
 		
@@ -1777,15 +1767,11 @@ Zotero.Sync.Server = new function () {
 										+ pr.BUTTON_DELAY_ENABLE;
 						var index = pr.confirmEx(
 							Zotero.getString('general.warning'),
-							// TODO: localize
-							"You no longer have write access to the Zotero group '" + group.name + "', "
-								+ "and changes you've made cannot be synced to the server.\n\n"
-								+ "If you continue, your copy of the group will be reset to its state "
-								+ "on the server, and your local modifications will be lost.\n\n"
-								+ "If you would like a chance to copy your changes elsewhere or to request "
-								+ "write access from a group administrator, cancel the sync now.",
+							Zotero.getString('sync.error.writeAccessLost', group.name) + "\n\n"
+								+ Zotero.getString('sync.error.groupWillBeReset') + "\n\n"
+								+ Zotero.getString('sync.error.copyChangedItems'),
 							buttonFlags,
-							"Reset Group and Sync",
+							Zotero.getString('sync.resetGroupAndSync'),
 							null, null, null, {}
 						);
 						
@@ -1939,7 +1925,7 @@ Zotero.Sync.Server = new function () {
 						+ "have synced with the '" + lastUsername + "' account before "
 						+ "syncing with the '" + username + "' account.";
 				
-				var syncButtonText = "Remove Groups and Sync";
+				var syncButtonText = Zotero.getString('sync.removeGroupsAndSync');
 			}
 			// If there are no local groups and the server is empty,
 			// don't bother prompting
@@ -1954,7 +1940,7 @@ Zotero.Sync.Server = new function () {
 					buttonFlags,
 					syncButtonText,
 					null,
-					"Open Sync Preferences",
+					Zotero.getString('sync.openSyncPreferences'),
 					null, {}
 				);
 				
@@ -2056,11 +2042,11 @@ Zotero.Sync.Server = new function () {
 											+ (pr.BUTTON_POS_1) * (pr.BUTTON_TITLE_CANCEL);
 						// TODO: localize
 						if (e.error == Zotero.Error.ERROR_SYNC_USERNAME_NOT_SET) {
-							var title = "Username Not Set";
+							var title = Zotero.getString('sync.error.usernameNotSet');
 							var msg = "You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server."
 						}
 						else {
-							var title = "Invalid Username/Password";
+							var title = Zotero.getString('sync.error.invalidLogin');
 							var msg = "The Zotero sync server did not accept your username and password.\n\n"
 									+ "Please check that you have entered your zotero.org login information correctly in the Zotero sync preferences.";
 						}
@@ -2069,7 +2055,7 @@ Zotero.Sync.Server = new function () {
 							title,
 							msg,
 							buttonFlags,
-							"Open Sync Preferences",
+							Zotero.getString('sync.openSyncPreferences'),
 							null, null, null, {}
 						);
 						
@@ -2729,8 +2715,11 @@ Zotero.Sync.Server.Data = new function() {
 				if (Zotero.Sync.Runner.background) {
 					Zotero.Sync.Server.manualSyncRequired = true;
 					
-					// TODO: localize
-					throw ("An automatic sync resulted in a conflict that requires manual intervention.\n\nClick the sync icon to sync manually.");
+					throw (
+						Zotero.getString('sync.error.manualInterventionRequired')
+						+ "\n\n"
+						+ Zotero.getString('sync.error.clickSyncIcon')
+					);
 				}
 				
 				var mergeData = _reconcile(type, toReconcile, remoteCreatorStore);
@@ -3248,10 +3237,9 @@ Zotero.Sync.Server.Data = new function() {
 			dataIn: {
 				type: type,
 				captions: [
-					// TODO: localize
-					'Local Object',
-					'Remote Object',
-					'Merged Object'
+					Zotero.getString('sync.localObject'),
+					Zotero.getString('sync.remoteObject'),
+					Zotero.getString('sync.mergedObject')
 				],
 				objects: objectPairs
 			}
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 43459c2fad..fbbb18a72f 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -326,7 +326,6 @@ var Zotero = new function(){
 		}
 		catch (e) {
 			if (e.name == 'NS_ERROR_FILE_ACCESS_DENIED') {
-				// TODO: localize
 				var msg = Zotero.localeJoin([
 					Zotero.getString('startupError.databaseCannotBeOpened'),
 					Zotero.getString('startupError.checkPermissions')
@@ -363,17 +362,16 @@ var Zotero = new function(){
 			}
 			catch (e) {
 				if (typeof e == 'string' && e.match('newer than SQL file')) {
-					// TODO: localize
-					var zoteroVersionIsOlder = "This version of Zotero is older than the version last used with your database.";
-					var upgradeToLatestVersion = "Please upgrade to the latest version from zotero.org.";
-					var currentVersion = "Current version: " + this.version;
-					var kbURL = "http://zotero.org/support/kb/newer_db_version";
-					var seeKB = "See " + kbURL + " for more information.";
-					var msg = Zotero.localeJoin([zoteroVersionIsOlder, upgradeToLatestVersion]) + "\n\n" + currentVersion + "\n\n" + seeKB;
+					var msg = Zotero.localeJoin([
+							Zotero.getString('startupError.zoteroVersionIsOlder'),
+							Zotero.getString('startupError.zoteroVersionIsOlder.upgrade')
+						]) + "\n\n"
+						+ Zotero.getString('startupError.zoteroVersionIsOlder.current') + "\n\n"
+						+ Zotero.getString('general.seeForMoreInformation', kbURL);
 					this.startupError = msg;
 				}
 				else {
-					this.startupError = "Database upgrade error";
+					this.startupError = Zotero.getString('startupError.databaseUpgradeError');
 				}
 				Components.utils.reportError(e);
 				return false;
@@ -2139,8 +2137,6 @@ Zotero.Date = new function(){
 	 * @return	{String}
 	 */
 	this.toRelativeDate = function (date) {
-		// TODO: localize
-		
 		var str;
 		var now = new Date();
 		var timeSince = now.getTime() - date;
@@ -2150,47 +2146,54 @@ Zotero.Date = new function(){
 		var inDays = timeSince / 1000 / 60 / 60 / 24;
 		var inYears = timeSince / 1000 / 60 / 60 / 24 / 365;
 		
+		var n;
+		
 		// in seconds
 		if (Math.round(inSeconds) == 1) {
-			str = "1 second ago";
+			var key = "secondsAgo";
 		}
 		else if (inMinutes < 1.01) {
-			str = Math.round(inSeconds) + " seconds ago";
+			var key = "secondsAgo";
+			n = Math.round(inSeconds);
 		}
 		
 		// in minutes
 		else if (Math.round(inMinutes) == 1) {
-			str = "1 minute ago";
+			var key = "minutesAgo";
 		}
 		else if (inHours < 1.01) {
-			str = Math.round(inMinutes) + " minutes ago";
+			var key = "minutesAgo";
+			n = Math.round(inMinutes);
 		}
 		
 		// in hours
 		else if (Math.round(inHours) == 1) {
-			str = "1 hour ago";
+			var key = "hoursAgo";
 		}
 		else if (inDays < 1.01) {
-			str = Math.round(inHours) + " hours ago";
+			var key = "hoursAgo";
+			n = Math.round(inHours);
 		}
 		
 		// in days
 		else if (Math.round(inDays) == 1) {
-			str = "1 day ago";
+			var key = "daysAgo";
 		}
 		else if (inYears < 1.01) {
-			str = Math.round(inDays) + " days ago";
+			var key = "daysAgo";
+			n = Math.round(inDays);
 		}
 		
 		// in years
 		else if (Math.round(inYears) == 1) {
-			str = "1 year ago";
+			var key = "yearsAgo";
 		}
 		else {
-			str = Math.round(inYears) + " years ago";
+			var key = "yearsAgo";
+			var n = Math.round(inYears);
 		}
 		
-		return str;
+		return Zotero.getString("date.relative." + key + "." + (n ? "multiple" : "one"), n);
 	}
 	
 	
diff --git a/chrome/locale/af-ZA/zotero/zotero.dtd b/chrome/locale/af-ZA/zotero/zotero.dtd
index 0559d9c87d..2b5462f15b 100644
--- a/chrome/locale/af-ZA/zotero/zotero.dtd
+++ b/chrome/locale/af-ZA/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Add Selection to Zotero Note">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Create Zotero Item and Note from Selection">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Save Link As Zotero Snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Save Image As Zotero Snapshot">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Notes">
diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties
index d882f2883c..28040b5f15 100644
--- a/chrome/locale/af-ZA/zotero/zotero.properties
+++ b/chrome/locale/af-ZA/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=The directory you selected is not empty and doe
 
 startupError=There was an error starting Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Are you sure you want to delete the selected collection?
 pane.collections.deleteSearch=Are you sure you want to delete the selected search?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Item Saved
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/ar/zotero/zotero.dtd b/chrome/locale/ar/zotero/zotero.dtd
index e32548d3b0..5bf1bcd587 100644
--- a/chrome/locale/ar/zotero/zotero.dtd
+++ b/chrome/locale/ar/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "أضف التحديد لملاحظة زوتيرو.">
 <!ENTITY zotero.contextMenu.addTextToNewNote "انشئ عنصر وملاحظة من العنصر المحدد.">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "احفظ الرابط كلقطة فوتوغرافية">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "احفظ الصورة كلقطة فوتوغرافية">
 
 <!ENTITY zotero.tabs.info.label "معلومات">
 <!ENTITY zotero.tabs.notes.label "ملاحظات">
diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties
index 6e14c508eb..8e37013cf0 100644
--- a/chrome/locale/ar/zotero/zotero.properties
+++ b/chrome/locale/ar/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=الدليل المختار غير فارغ، 
 
 startupError=هناك خطأ في إقلاع زوتيرو
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=هل أنت متأكد من رغبتك في حذف المجموعة المختارة؟
 pane.collections.deleteSearch=هل أنت متأكد من رغبتك في حذف البحث المختار؟
@@ -347,7 +346,7 @@ ingester.scrapeComplete=تم حفظ الموضوع
 ingester.scrapeError=تعذر حفظ الموضوع
 ingester.scrapeErrorDescription=حصل خطأ عند حفظ الموضوع. راجع %S للمزيد من المعلومات.
 ingester.scrapeErrorDescription.linkText=مشاكل ترجمة معروفة
-ingester.scrapeError.transactionInProgress.previousError=عملية الحفظ فشلت بسبب خطأ سابق من زوتيرو
+ingester.scrapeErrorDescription.previousError=عملية الحفظ فشلت بسبب خطأ سابق من زوتيرو
 
 db.dbCorrupted=قاعدة بيانات زوتيرو '%S'  تبدو غير صالحة.
 db.dbCorrupted.restart=فضلاً أعد تشغيل المتصفح لمحاولة الاسترجاع التلقائية من آخر نسخة احتياطية.
diff --git a/chrome/locale/bg-BG/zotero/zotero.dtd b/chrome/locale/bg-BG/zotero/zotero.dtd
index 22884412cd..48fb425b42 100644
--- a/chrome/locale/bg-BG/zotero/zotero.dtd
+++ b/chrome/locale/bg-BG/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Добавяне избраното към бележка в Зотеро">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Създаване на обект и бележка в Зотеро от избраното.">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Запазване на копие на връзката в Зотеро">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Запазване на копие образа в Зотеро">
 
 <!ENTITY zotero.tabs.info.label "Информация">
 <!ENTITY zotero.tabs.notes.label "Бележки">
diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties
index a988c6459e..31e284a461 100644
--- a/chrome/locale/bg-BG/zotero/zotero.properties
+++ b/chrome/locale/bg-BG/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Папката която избрахте не
 
 startupError=Появи се грешка при стартирането на Зотеро.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Сигурни ли сте, че искате да изтриете избраната колекция?
 pane.collections.deleteSearch=Сигурни ли сте, че искате да изтриете избраното търсене?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Обекта е Записан.
 ingester.scrapeError=Обекта не Беше Записан.
 ingester.scrapeErrorDescription=По време на записа на този обект възникна грешка. Моля опитайте отново. Ако тази грешка продължава да се появява, моля свържете се с автора на преводача.
 ingester.scrapeErrorDescription.linkText=Известни проблеми с преводача
-ingester.scrapeError.transactionInProgress.previousError=Записът е прекратен поради предходяща грешка в Зотеро.
+ingester.scrapeErrorDescription.previousError=Записът е прекратен поради предходяща грешка в Зотеро.
 
 db.dbCorrupted=Базата данни '%S' на Зотеро вероятно е повредена.
 db.dbCorrupted.restart=Моля рестартирайте Firefox за да опитате автоматично възстановяване от последното резервно копие.
diff --git a/chrome/locale/ca-AD/zotero/zotero.dtd b/chrome/locale/ca-AD/zotero/zotero.dtd
index 76e3d17a36..4b80547775 100644
--- a/chrome/locale/ca-AD/zotero/zotero.dtd
+++ b/chrome/locale/ca-AD/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Afegeix la selecció a una nota de Zotero">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Crea un element de Zotero i una nota amb la selecció">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Desa l&apos;enllaç com una captura de Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Desa l&apos;imatge com una captura de Zotero">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Notes">
diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties
index 48f1bc84d0..9e96d02bc8 100644
--- a/chrome/locale/ca-AD/zotero/zotero.properties
+++ b/chrome/locale/ca-AD/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=El directori que has seleccionat no està buit
 
 startupError=Hi ha hagut un error en iniciar Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Estàs segur que vols eliminar la col·lecció seleccionada?
 pane.collections.deleteSearch=Estàs segur que vols eliminar la cerca seleccionada?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Element desat.
 ingester.scrapeError=No s'ha pogut desar l'element.
 ingester.scrapeErrorDescription=S'ha produït un error quan es desava aquest element. Comprova %S per a més informació
 ingester.scrapeErrorDescription.linkText=Incidències conegudes per aquest traductor
-ingester.scrapeError.transactionInProgress.previousError=El procés de desar ha fallat degut a un error anterior de Zotero.
+ingester.scrapeErrorDescription.previousError=El procés de desar ha fallat degut a un error anterior de Zotero.
 
 db.dbCorrupted=Sembla que la base de dades '%S' de Zotero s'ha corromput.
 db.dbCorrupted.restart=Si-us-plau reinicia el Firefox per intentar una restauració automàtica a partir de l'última copia de seguretat.
diff --git a/chrome/locale/cs-CZ/zotero/zotero.dtd b/chrome/locale/cs-CZ/zotero/zotero.dtd
index c7888cb723..5abe6fb640 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.dtd
+++ b/chrome/locale/cs-CZ/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Přidat výběr do Zotero poznámky">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Vytvoř Zotero položku a Poznámku z výběru">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Ulož odkaz jako Zotero snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Ulož obraz jako Zotero snapshot">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Poznámky">
diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties
index 66ceb1dcfd..51c396e961 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.properties
+++ b/chrome/locale/cs-CZ/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Adresář, který jste vybrali, není prázdný
 
 startupError=Při spouštění aplikace Zotero nastala chyba.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Chcete opravdu smazat zvolenou kolekci?
 pane.collections.deleteSearch=Chcete opravdu smazat vybrané vyhledávání?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Položka uložena
 ingester.scrapeError=Nebylo možné uložit položku
 ingester.scrapeErrorDescription=Při ukládání této položky nastala chyba. Zkontrolujte %S pro více informací.
 ingester.scrapeErrorDescription.linkText=Známý problém překladatele
-ingester.scrapeError.transactionInProgress.previousError=Ukládání selhalo z důvodu předchozí chyby v Zotero.
+ingester.scrapeErrorDescription.previousError=Ukládání selhalo z důvodu předchozí chyby v Zotero.
 
 db.dbCorrupted=Zotero databáze '%S' byla pravděpodobně porušena.
 db.dbCorrupted.restart=Restartujete Firefox, prosím, proběhne pokus o obnovu z minulé zálohy.
diff --git a/chrome/locale/da-DK/zotero/zotero.dtd b/chrome/locale/da-DK/zotero/zotero.dtd
index 9fdaecabf4..cdf60015a5 100644
--- a/chrome/locale/da-DK/zotero/zotero.dtd
+++ b/chrome/locale/da-DK/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Tilføj Markeret Text til Notat">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Create Zotero Item and Note from Selection">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Save Link As Zotero Snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Save Image As Zotero Snapshot">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Notes">
diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties
index 43cf815a2d..43b26e69d0 100644
--- a/chrome/locale/da-DK/zotero/zotero.properties
+++ b/chrome/locale/da-DK/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=The directory you selected is not empty and doe
 
 startupError=There was an error starting Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Er du sikker på at du vil slette den valgte samling?
 pane.collections.deleteSearch=Er du sikker på at du vil slette den valgte søgning?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Element gemt.
 ingester.scrapeError=Elementet kunne ikke gemmes.
 ingester.scrapeErrorDescription=En fejl opstod under forsøget på at gemme elementet. Prøv venligst igen. Hvis fejlen er vedvarende, kontakt venligst forfatteren af oversættelsesmodulet.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/de-AT/zotero/zotero.dtd b/chrome/locale/de-AT/zotero/zotero.dtd
index b55cf24155..2ae1e0ce59 100644
--- a/chrome/locale/de-AT/zotero/zotero.dtd
+++ b/chrome/locale/de-AT/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Auswahl zu Zotero-Notiz hinzufügen">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Zotero-Notiz aus Auswahl erstellen">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Save Link As Zotero Snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Save Image As Zotero Snapshot">
 
 <!ENTITY zotero.tabs.info.label "Infos">
 <!ENTITY zotero.tabs.notes.label "Notizen">
diff --git a/chrome/locale/de-AT/zotero/zotero.properties b/chrome/locale/de-AT/zotero/zotero.properties
index eed38446fe..052527cabc 100644
--- a/chrome/locale/de-AT/zotero/zotero.properties
+++ b/chrome/locale/de-AT/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=The directory you selected is not empty and doe
 
 startupError=There was an error starting Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Sind Sie sicher, dass Sie die ausgewählte Sammlung löschen möchten?
 pane.collections.deleteSearch=Sind Sie sicher, dass Sie die ausgewählte Suche löschen möchten?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Artikel gespeichert.
 ingester.scrapeError=Artikel konnte nicht gespeichert werden.
 ingester.scrapeErrorDescription=Ein Fehler ist aufgetreten bei dem Versuch, diesen Artikel zu speichern. Wenn dieser Fehler weiterhin auftritt, kontaktieren Sie bitte den Autor des Übersetzers.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/de-CH/zotero/zotero.dtd b/chrome/locale/de-CH/zotero/zotero.dtd
index b55cf24155..2ae1e0ce59 100644
--- a/chrome/locale/de-CH/zotero/zotero.dtd
+++ b/chrome/locale/de-CH/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Auswahl zu Zotero-Notiz hinzufügen">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Zotero-Notiz aus Auswahl erstellen">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Save Link As Zotero Snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Save Image As Zotero Snapshot">
 
 <!ENTITY zotero.tabs.info.label "Infos">
 <!ENTITY zotero.tabs.notes.label "Notizen">
diff --git a/chrome/locale/de-CH/zotero/zotero.properties b/chrome/locale/de-CH/zotero/zotero.properties
index cb3cb074a0..daf6962a9b 100644
--- a/chrome/locale/de-CH/zotero/zotero.properties
+++ b/chrome/locale/de-CH/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=The directory you selected is not empty and doe
 
 startupError=There was an error starting Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Sind Sie sicher, dass Sie die ausgewählte Sammlung löschen möchten?
 pane.collections.deleteSearch=Sind Sie sicher, dass Sie die ausgewählte Suche löschen möchten?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Artikel gespeichert.
 ingester.scrapeError=Artikel konnte nicht gespeichert werden.
 ingester.scrapeErrorDescription=Ein Fehler ist aufgetreten bei dem Versuch, diesen Artikel zu speichern. Wenn dieser Fehler weiterhin auftritt, kontaktieren Sie bitte den Autor des Übersetzers.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/de-DE/zotero/zotero.dtd b/chrome/locale/de-DE/zotero/zotero.dtd
index 97a62a5639..5ceb013077 100644
--- a/chrome/locale/de-DE/zotero/zotero.dtd
+++ b/chrome/locale/de-DE/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Auswahl zu Zotero-Notiz hinzufügen">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Zotero-Notiz aus Auswahl erstellen">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Link als Zotero-Schnappschuss speichern">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Bild als Zotero-Schnappschuss speichern">
 
 <!ENTITY zotero.tabs.info.label "Infos">
 <!ENTITY zotero.tabs.notes.label "Notizen">
diff --git a/chrome/locale/de-DE/zotero/zotero.properties b/chrome/locale/de-DE/zotero/zotero.properties
index c2208a397b..f000d675d9 100644
--- a/chrome/locale/de-DE/zotero/zotero.properties
+++ b/chrome/locale/de-DE/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Das Verzeichnis, das Sie ausgewählt haben, ist
 
 startupError=Es gab einen Fehler beim Starten von Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Sind Sie sicher, dass Sie die ausgewählte Sammlung löschen möchten?
 pane.collections.deleteSearch=Sind Sie sicher, dass Sie die ausgewählte Suche löschen möchten?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Artikel gespeichert.
 ingester.scrapeError=Artikel konnte nicht gespeichert werden.
 ingester.scrapeErrorDescription=Ein Fehler ist aufgetreten bei dem Versuch, diesen Artikel zu speichern. Wenn dieser Fehler weiterhin auftritt, kontaktieren Sie bitte den Autor des Übersetzers.
 ingester.scrapeErrorDescription.linkText=Bekannte Translator-Probleme
-ingester.scrapeError.transactionInProgress.previousError=Der Speichervorgang scheiterte wegen eines vorangegangenen Zotero-Fehlers.
+ingester.scrapeErrorDescription.previousError=Der Speichervorgang scheiterte wegen eines vorangegangenen Zotero-Fehlers.
 
 db.dbCorrupted=Die Zotero-Datenbank '%S' scheint beschädigt zu sein.
 db.dbCorrupted.restart=Bitte starten Sie Firefox neu, um eine automatische Wiederherstellung aus dem letzten Backup zu versuchen.
diff --git a/chrome/locale/el-GR/zotero/zotero.dtd b/chrome/locale/el-GR/zotero/zotero.dtd
index 0559d9c87d..2b5462f15b 100644
--- a/chrome/locale/el-GR/zotero/zotero.dtd
+++ b/chrome/locale/el-GR/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Add Selection to Zotero Note">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Create Zotero Item and Note from Selection">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Save Link As Zotero Snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Save Image As Zotero Snapshot">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Notes">
diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties
index d882f2883c..28040b5f15 100644
--- a/chrome/locale/el-GR/zotero/zotero.properties
+++ b/chrome/locale/el-GR/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=The directory you selected is not empty and doe
 
 startupError=There was an error starting Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Are you sure you want to delete the selected collection?
 pane.collections.deleteSearch=Are you sure you want to delete the selected search?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Item Saved
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index 041f840d0c..df20be6506 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -1,6 +1,8 @@
 <!ENTITY zotero.preferences.title						"Zotero Preferences">
 
 <!ENTITY zotero.preferences.default					"Default:">
+<!ENTITY zotero.preferences.items						 "items">
+<!ENTITY zotero.preferences.period						 ".">
 
 <!ENTITY zotero.preferences.prefpane.general				"General">
 
@@ -11,6 +13,7 @@
 <!ENTITY zotero.preferences.fontSize.small				"Small">
 <!ENTITY zotero.preferences.fontSize.medium				"Medium">
 <!ENTITY zotero.preferences.fontSize.large				"Large">
+<!ENTITY zotero.preferences.fontSize.notes				"Note font size:">
 
 <!ENTITY zotero.preferences.miscellaneous				"Miscellaneous">
 <!ENTITY zotero.preferences.autoUpdate					"Automatically check for updated translators">
@@ -23,6 +26,12 @@
 <!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">
 
+<!ENTITY zotero.preferences.groups						"Groups">
+<!ENTITY zotero.preferences.groups.whenCopyingInclude	"When copying items between libraries, include:">
+<!ENTITY zotero.preferences.groups.childNotes			"child notes">
+<!ENTITY zotero.preferences.groups.childFiles			"child snapshots and imported files">
+<!ENTITY zotero.preferences.groups.childLinks			"child links">
+
 <!ENTITY zotero.preferences.openurl.caption				"OpenURL">
 
 <!ENTITY zotero.preferences.openurl.search				"Search for resolvers">
@@ -30,6 +39,31 @@
 <!ENTITY zotero.preferences.openurl.server				"Resolver:">
 <!ENTITY zotero.preferences.openurl.version				"Version:">
 
+<!ENTITY zotero.preferences.prefpane.sync							"Sync">
+<!ENTITY zotero.preferences.sync.username							"Username:">
+<!ENTITY zotero.preferences.sync.password							"Password:">
+<!ENTITY zotero.preferences.sync.syncServer						"Zotero Sync Server">
+<!ENTITY zotero.preferences.sync.createAccount						"Create Account">
+<!ENTITY zotero.preferences.sync.lostPassword						"Lost Password?">
+<!ENTITY zotero.preferences.sync.syncAutomatically					"Sync automatically">
+<!ENTITY zotero.preferences.sync.fileSyncing						"File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.url					"URL:">
+<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary				"Sync attachment files in My Library using">
+<!ENTITY zotero.preferences.sync.fileSyncing.groups				"Sync attachment files in group libraries using Zotero storage">
+<!ENTITY zotero.preferences.sync.fileSyncing.about					"About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.tos1					"By using Zotero storage, you agree to become bound by its">
+<!ENTITY zotero.preferences.sync.fileSyncing.tos2					"terms and conditions">
+<!ENTITY zotero.preferences.sync.reset.fullSync					"Full Sync with Zotero Server">
+<!ENTITY zotero.preferences.sync.reset.fullSync.desc				"Merge local Zotero data with data from the sync server, ignoring sync history.">
+<!ENTITY zotero.preferences.sync.reset.restoreFromServer			"Restore from Zotero Server">
+<!ENTITY zotero.preferences.sync.reset.restoreFromServer.desc		"Erase all local Zotero data and restore from the sync server.">
+<!ENTITY zotero.preferences.sync.reset.restoreToServer				"Restore to Zotero Server">
+<!ENTITY zotero.preferences.sync.reset.restoreToServer.desc		"Erase all server data and overwrite with local Zotero data.">
+<!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory		"Reset File Sync History">
+<!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc	"Force checking of the storage server for all local attachment files.">
+<!ENTITY zotero.preferences.sync.reset.button						"Reset...">
+
+
 <!ENTITY zotero.preferences.prefpane.search				"Search">
 <!ENTITY zotero.preferences.search.fulltextCache			"Full-Text Cache">
 <!ENTITY zotero.preferences.search.pdfIndexing				"PDF Indexing">
@@ -57,6 +91,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath "Domain/Path">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
+<!ENTITY zotero.preferences.quickCopy.dragLimit			 "Disable Quick Copy when dragging more than">
+
 
 <!ENTITY zotero.preferences.prefpane.styles					"Styles">
 
@@ -117,4 +153,12 @@
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck			"Check Database Integrity">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles	"Reset Translators and Styles...">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslators				"Reset Translators...">
-<!ENTITY zotero.preferences.dbMaintenance.resetStyles					"Reset Styles...">
\ No newline at end of file
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles					"Reset Styles...">
+
+<!ENTITY zotero.preferences.debugOutputLogging							"Debug Output Logging">
+<!ENTITY zotero.preferences.debugOutputLogging.message					"Debug output can help Zotero developers diagnose problems in Zotero. Debug logging will slow down Zotero, so you should generally leave it disabled unless a Zotero developer requests debug output.">
+<!ENTITY zotero.preferences.debugOutputLogging.linesLogged				"lines logged">
+<!ENTITY zotero.preferences.debugOutputLogging.enableAfterRestart		"Enable after restart">
+<!ENTITY zotero.preferences.debugOutputLogging.viewOutput				"View Output">
+<!ENTITY zotero.preferences.debugOutputLogging.clearOutput				"Clear Output">
+<!ENTITY zotero.preferences.debugOutputLogging.submitToServer			"Submit to Zotero Server">
\ No newline at end of file
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 267ff1771b..04a1726922 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -1,5 +1,9 @@
 <!ENTITY zotero.general.optional							"(Optional)">
 <!ENTITY zotero.general.note								"Note:">
+<!ENTITY zotero.general.selectAll							"Select All">
+<!ENTITY zotero.general.deselectAll						"Deselect All">
+<!ENTITY zotero.general.edit								"Edit">
+<!ENTITY zotero.general.delete 								"Delete">
 
 <!ENTITY zotero.errorReport.unrelatedMessages				"The error log may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress			"Please wait while the error report is submitted.">
@@ -23,8 +27,8 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote		"Add Selection to Zotero Note">
 <!ENTITY zotero.contextMenu.addTextToNewNote			"Create Zotero Item and Note from Selection">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot		"Save Link As Zotero Snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot		"Save Image As Zotero Snapshot">
+<!ENTITY zotero.contextMenu.saveLinkAsItem			"Save Link As Zotero Item">
+<!ENTITY zotero.contextMenu.saveImageAsItem		"Save Image As Zotero Item">
 
 <!ENTITY zotero.tabs.info.label						"Info">
 <!ENTITY zotero.tabs.notes.label						"Notes">
@@ -53,8 +57,12 @@
 
 <!ENTITY zotero.items.menu.showInLibrary					"Show in Library">
 <!ENTITY zotero.items.menu.attach.note					"Add Note">
+<!ENTITY zotero.items.menu.attach						"Add Attachment">
 <!ENTITY zotero.items.menu.attach.snapshot				"Attach Snapshot of Current Page">
 <!ENTITY zotero.items.menu.attach.link					"Attach Link to Current Page">
+<!ENTITY zotero.items.menu.attach.file					"Attach Stored Copy of File...">
+<!ENTITY zotero.items.menu.attach.fileLink				"Attach Link to File...">
+
 <!ENTITY zotero.items.menu.duplicateItem					"Duplicate Selected Item">
 
 <!ENTITY zotero.toolbar.newItem.label					"New Item">
@@ -167,10 +175,22 @@
 
 <!ENTITY zotero.integration.references.label			"References in Bibliography">
 
+<!ENTITY zotero.sync.button							"Sync with Zotero Server">
+<!ENTITY zotero.sync.error							"Sync Error">
 <!ENTITY zotero.sync.storage.progress				"Progress:">
 <!ENTITY zotero.sync.storage.downloads				"Downloads:">
 <!ENTITY zotero.sync.storage.uploads					"Uploads:">
 
+<!ENTITY zotero.sync.longTagFixer.followingTagTooLong		"The following tag in your Zotero library is too long to sync to the server:">
+<!ENTITY zotero.sync.longTagFixer.syncedTagSizeLimit		"Synced tags must be shorter than 256 characters.">
+<!ENTITY zotero.sync.longTagFixer.splitEditDelete			"You can either split the tag into multiple tags, edit the tag manually to shorten it, or delete it.">
+<!ENTITY zotero.sync.longTagFixer.split					"Split">
+<!ENTITY zotero.sync.longTagFixer.splitAtThe				"Split at the">
+<!ENTITY zotero.sync.longTagFixer.character				"character">
+<!ENTITY zotero.sync.longTagFixer.characters				"characters">
+<!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved	"Unchecked tags will not be saved.">
+<!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted			"The tag will be deleted from all items.">
+
 <!ENTITY zotero.proxy.recognized.title					"Proxy Recognized">
 <!ENTITY zotero.proxy.recognized.warning				"Only add proxies linked from your library, school, or corporate website">
 <!ENTITY zotero.proxy.recognized.warning.secondary		"Adding other proxies allows malicious sites to masquerade as sites you trust."> 
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index a2a08d1d85..922818b473 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -12,6 +12,7 @@ general.restartRequiredForChanges	= Firefox must be restarted for the changes to
 general.restartNow					= Restart now
 general.restartLater					= Restart later
 general.errorHasOccurred			= An error has occurred.
+general.unknownErrorOccurred		= An unknown error occurred.
 general.restartFirefox				= Please restart Firefox.
 general.restartFirefoxAndTryAgain	= Please restart Firefox and try again.
 general.checkForUpdate				= Check for update
@@ -25,6 +26,17 @@ general.passed						= Passed
 general.failed						= Failed
 general.and							= and
 general.accessDenied				= Access Denied
+general.permissionDenied			= Permission Denied
+general.character.singular			= character
+general.character.plural			= characters
+general.create						= Create
+general.seeForMoreInformation		= See %S for more information.
+general.enable						= Enable
+general.disable						= Disable
+
+general.operationInProgress = A Zotero operation is currently in progress.
+general.operationInProgress.waitUntilFinished = Please wait until has finished.
+general.operationInProgress.waitUntilFinishedAndTryAgain = Please wait until it has finished and try again.
 
 install.quickStartGuide				= Quick Start Guide
 install.quickStartGuide.message.welcome 		= Welcome to Zotero!
@@ -37,7 +49,10 @@ upgrade.advanceMessage				= Press %S to upgrade now.
 upgrade.dbUpdateRequired			= The Zotero database must be updated.
 upgrade.integrityCheckFailed		= Your Zotero database must be repaired before the upgrade can continue.
 upgrade.loadDBRepairTool			= Load Database Repair Tool
+upgrade.couldNotMigrate				= Zotero could not migrate all necessary files.\nPlease close any open attachment files and restart Firefox to try the upgrade again.
+upgrade.couldNotMigrate.restart		= If you continue to receive this message, restart your computer.
 
+errorReport.reportError				= Report Error...
 errorReport.reportErrors			= Report Errors...
 errorReport.reportInstructions		= You can report this error by selecting "%S" from the Actions (gear) menu.
 errorReport.followingErrors			= The following errors have occurred since starting %S:
@@ -53,9 +68,24 @@ dataDir.selectDir					= Select a Zotero data directory
 dataDir.selectedDirNonEmpty.title		= Directory Not Empty
 dataDir.selectedDirNonEmpty.text		= The directory you selected is not empty and does not appear to be a Zotero data directory.\n\nCreate Zotero files in this directory anyway?
 
-startupError						= There was an error starting Zotero.
-startupError.databaseCannotBeOpened	= The Zotero database cannot be opened.
-startupError.checkPermissions 			= Please make sure you have read and write permissions to all files in the Zotero data directory.
+startupError								= There was an error starting Zotero.
+startupError.databaseCannotBeOpened		= The Zotero database cannot be opened.
+startupError.checkPermissions 				= Make sure you have read and write permissions to all files in the Zotero data directory.
+startupError.zoteroVersionIsOlder			= This version of Zotero is older than the version last used with your database.
+startupError.zoteroVersionIsOlder.upgrade	= Please upgrade to the latest version from zotero.org.
+startupError.zoteroVersionIsOlder.current	= Current version: %S
+startupError.databaseUpgradeError			= Database upgrade error
+
+date.relative.secondsAgo.one			= 1 second ago
+date.relative.secondsAgo.multiple		= %S seconds ago
+date.relative.minutesAgo.one			= 1 minute ago
+date.relative.minutesAgo.multiple		= %S minutes ago
+date.relative.hoursAgo.one				= 1 hour ago
+date.relative.hoursAgo.multiple			= %S hours ago
+date.relative.daysAgo.one				= 1 day ago
+date.relative.daysAgo.multiple			= %S days ago
+date.relative.yearsAgo.one				= 1 year ago
+date.relative.yearsAgo.multiple			= %S years ago
 
 pane.collections.delete			= Are you sure you want to delete the selected collection?
 pane.collections.deleteSearch	= Are you sure you want to delete the selected search?
@@ -90,9 +120,12 @@ pane.tagSelector.numSelected.singular			= %S tag selected
 pane.tagSelector.numSelected.plural				= %S tags selected
 
 pane.items.loading				= Loading items list...
+pane.items.trash.title			= Move to Trash
+pane.items.trash				= Are you sure you want to move the selected item to the Trash?
+pane.items.trash.multiple		= Are you sure you want to move the selected items to the Trash?
+pane.items.delete.title			= Delete
 pane.items.delete				= Are you sure you want to delete the selected item?
 pane.items.delete.multiple		= Are you sure you want to delete the selected items?
-pane.items.delete.title			= Delete
 pane.items.menu.remove			= Remove Selected Item
 pane.items.menu.remove.multiple	= Remove Selected Items
 pane.items.menu.erase			= Delete Selected Item from Library...
@@ -107,6 +140,10 @@ pane.items.menu.reindexItem					= Reindex Item
 pane.items.menu.reindexItem.multiple		= Reindex Items
 pane.items.menu.recognizePDF				= Retrieve Metadata for PDF
 pane.items.menu.recognizePDF.multiple		= Retrieve Metadata for PDFs
+pane.items.menu.createParent = Create Parent Item from Selected Item
+pane.items.menu.createParent.multiple = Create Parent Items from Selected Items
+pane.items.menu.renameAttachments = Rename File from Parent Metadata
+pane.items.menu.renameAttachments.multiple = Rename Files from Parent Metadata
 
 pane.items.letter.oneParticipant		= Letter to %S
 pane.items.letter.twoParticipants		= Letter to %S and %S
@@ -351,7 +388,7 @@ ingester.scrapeComplete			= Item Saved
 ingester.scrapeError			= Could Not Save Item
 ingester.scrapeErrorDescription	= An error occurred while saving this item. Check %S for more information.
 ingester.scrapeErrorDescription.linkText = Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError = The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError = The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted					= The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart			= Please restart Firefox to attempt an automatic restore from the last backup.
@@ -417,6 +454,7 @@ fileInterface.fileFormatUnsupported = No translator could be found for the given
 fileInterface.untitledBibliography = Untitled Bibliography
 fileInterface.bibliographyHTMLTitle = Bibliography
 fileInterface.importError 		= An error occurred while trying to import the selected file. Please ensure that the file is valid and try again.
+fileInterface.importClipboardNoDataError = No importable data could be read from the clipboard.
 fileInterface.noReferencesError	= The items you have selected contain no references. Please select one or more references and try again.
 fileInterface.bibliographyGenerationError = An error occurred generating your bibliography. Please try again.
 fileInterface.exportError = An error occurred while trying to export the selected file.
@@ -540,9 +578,70 @@ styles.installSourceError			= %1$S references an invalid or non-existent CSL fil
 styles.deleteStyle					= Are you sure you want to delete the style "%1$S"?
 styles.deleteStyles					= Are you sure you want to delete the selected styles?
 
-sync.storage.kbRemaining                                = %SKB remaining
-sync.storage.filesRemaining                             = %1$S/%2$S files
-sync.storage.none                                       = None
+sync.cancel							= Cancel Sync
+sync.openSyncPreferences			= Open Sync Preferences...
+sync.resetGroupAndSync				= Reset Group and Sync
+sync.removeGroupsAndSync			= Remove Groups and Sync
+sync.localObject					= Local Object
+sync.remoteObject					= Remote Object
+sync.mergedObject					= Merged Object
+
+sync.error.usernameNotSet			= Username not set
+sync.error.passwordNotSet			= Password not set
+sync.error.invalidLogin				= Invalid username or password
+sync.error.enterPassword			= Please enter a password.
+sync.error.loginManagerCorrupted1	= Zotero cannot access your login information, likely due to a corrupted Firefox login manager database.
+sync.error.loginManagerCorrupted2	= Close Firefox, back up and delete signons.* from your Firefox profile, and re-enter your Zotero login information in the Sync pane of the Zotero preferences.
+sync.error.syncInProgress			= A sync operation is already in progress.
+sync.error.syncInProgress.wait		= Wait for the previous sync to complete or restart Firefox.
+sync.error.writeAccessLost			= You no longer have write access to the Zotero group '%1$S', and files you've added or edited cannot be synced to the server.
+sync.error.groupWillBeReset			= If you continue, your copy of the group will be reset to its state on the server, and local modifications to items and files will be lost.
+sync.error.copyChangedItems			= If you would like a chance to copy your changes elsewhere or to request write access from a group administrator, cancel the sync now.
+sync.error.manualInterventionRequired	= An automatic sync resulted in a conflict that requires manual intervention.
+sync.error.clickSyncIcon			= Click the sync icon to sync manually.
+
+sync.status.notYetSynced			= Not yet synced
+sync.status.lastSync				= Last sync:
+sync.status.loggingIn				= Logging in to sync server
+sync.status.gettingUpdatedData		= Getting updated data from sync server
+sync.status.processingUpdatedData	= Processing updated data
+sync.status.uploadingData			= Uploading data to sync server
+sync.status.uploadAccepted			= Upload accepted \u2014 waiting for sync server
+sync.status.syncingFiles			= Syncing files
+
+sync.storage.kbRemaining			= %SKB remaining
+sync.storage.filesRemaining			= %1$S/%2$S files
+sync.storage.none					= None
+sync.storage.localFile				= Local File
+sync.storage.remoteFile				= Remote File
+sync.storage.savedFile				= Saved File
+sync.storage.serverConfigurationVerified		= Server configuration verified
+sync.storage.fileSyncSetUp						= File sync is successfully set up.
+
+sync.storage.error.serverCouldNotBeReached		= The server %1$S could not be reached.
+sync.storage.error.permissionDeniedAtAddress	= You do not have permission to create a Zotero directory at the following address:
+sync.storage.error.checkFileSyncSettings		= Please check your file sync settings or contact your server administrator.
+sync.storage.error.verificationFailed			= %1$S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
+sync.storage.error.fileInUse					= The file '%1$S' is in use and cannot be updated. Please close the file or restart your computer and try syncing again.
+sync.storage.error.fileEditingAccessLost		= You no longer have file editing access to the Zotero group '%1$S', and files you've added or edited cannot be synced to the server.
+sync.storage.error.copyChangedItems			= If you would like a chance to copy changed items and files elsewhere, cancel the sync now.
+sync.storage.error.fileUploadFailed			= File upload failed.
+sync.storage.error.directoryNotFound			= Directory not found
+sync.storage.error.doesNotExist					= %1$S does not exist.
+sync.storage.error.createNow					= Do you want to create it now?
+sync.storage.error.enterWebDAVURL				= Please enter a WebDAV URL.
+sync.storage.error.webDAVInvalidURL			= %1$S is not a valid WebDAV URL.
+sync.storage.error.webDAVInvalidLogin			= The WebDAV server did not accept the username and password you entered.
+sync.storage.error.webDAVPermissionDenied		= You don't have permission to access %1$S on the WebDAV server.
+sync.storage.error.webDAVInsufficientSpace		= A file upload failed due to insufficient space on the WebDAV server.
+
+sync.storage.error.webDAVSSLCertificateError	= SSL certificate error connecting to %1$S.
+sync.storage.error.webDAVSSLConnectionError	= SSL connection error connecting to %1$S.
+sync.storage.error.webDAVLoadURLForMoreInfo	= Load your WebDAV URL in the browser for more information.
+
+sync.longTagFixer.saveTag			= Save Tag
+sync.longTagFixer.saveTags			= Save Tags
+sync.longTagFixer.deleteTag			= Delete Tag
 
 proxies.multiSite					= Multi-Site
 proxies.error						= Invalid Proxy Settings
diff --git a/chrome/locale/es-ES/zotero/zotero.dtd b/chrome/locale/es-ES/zotero/zotero.dtd
index 196b98f1f5..fba66391b2 100644
--- a/chrome/locale/es-ES/zotero/zotero.dtd
+++ b/chrome/locale/es-ES/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Añadir selección a una nota en Zotero">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Crear un ítem y nota de Zotero a partir de la selección">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Guardar el enlace como instantánea de Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Guardar imagen como instantánea de Zotero">
 
 <!ENTITY zotero.tabs.info.label "Información">
 <!ENTITY zotero.tabs.notes.label "Notas">
diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties
index 836817e0d2..5ffd3a049b 100644
--- a/chrome/locale/es-ES/zotero/zotero.properties
+++ b/chrome/locale/es-ES/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=El directorio que has seleccionado no está vac
 
 startupError=Hubo un error al iniciar Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=¿Seguro que quieres borrar la colección seleccionada?
 pane.collections.deleteSearch=¿Seguro que quieres borrar la búsqueda seleccionada?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Ítem guardado.
 ingester.scrapeError=No he podido guardar el ítem.
 ingester.scrapeErrorDescription=Ha ocurrido un error al grabar este ítem. Mira en %S para más información.
 ingester.scrapeErrorDescription.linkText=Problemas conocidos del traductor
-ingester.scrapeError.transactionInProgress.previousError=La grabación ha fallado debido a un error anterior en Zotero.
+ingester.scrapeErrorDescription.previousError=La grabación ha fallado debido a un error anterior en Zotero.
 
 db.dbCorrupted=La base de datos de Zotero '%S' parece haberse corrompido.
 db.dbCorrupted.restart=Reinicia Firefox para intentar la recuperación automática con la última copia de seguridad.
diff --git a/chrome/locale/et-EE/zotero/zotero.dtd b/chrome/locale/et-EE/zotero/zotero.dtd
index 0559d9c87d..2b5462f15b 100644
--- a/chrome/locale/et-EE/zotero/zotero.dtd
+++ b/chrome/locale/et-EE/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Add Selection to Zotero Note">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Create Zotero Item and Note from Selection">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Save Link As Zotero Snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Save Image As Zotero Snapshot">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Notes">
diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties
index d882f2883c..28040b5f15 100644
--- a/chrome/locale/et-EE/zotero/zotero.properties
+++ b/chrome/locale/et-EE/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=The directory you selected is not empty and doe
 
 startupError=There was an error starting Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Are you sure you want to delete the selected collection?
 pane.collections.deleteSearch=Are you sure you want to delete the selected search?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Item Saved
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/fi-FI/zotero/zotero.dtd b/chrome/locale/fi-FI/zotero/zotero.dtd
index 0559d9c87d..2b5462f15b 100644
--- a/chrome/locale/fi-FI/zotero/zotero.dtd
+++ b/chrome/locale/fi-FI/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Add Selection to Zotero Note">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Create Zotero Item and Note from Selection">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Save Link As Zotero Snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Save Image As Zotero Snapshot">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Notes">
diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties
index 4b803dd209..a93dfe07b7 100644
--- a/chrome/locale/fi-FI/zotero/zotero.properties
+++ b/chrome/locale/fi-FI/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Valitsemasi kansio ei ole tyhjä eikä ilmeises
 
 startupError=Zoteron käynnistyksessä tapahtui virhe.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Haluatko varmasti poistaa valitun kokoelman?
 pane.collections.deleteSearch=Haluatko varmasti poistaa valitun haun?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Item Saved
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/fr-FR/zotero/zotero.dtd b/chrome/locale/fr-FR/zotero/zotero.dtd
index 44c485b0f7..ffd8d6587c 100644
--- a/chrome/locale/fr-FR/zotero/zotero.dtd
+++ b/chrome/locale/fr-FR/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Ajouter la sélection à la note Zotero">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Créer une note Zotero à partir de la sélection">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Enregistrer le lien en tant que capture d&apos;écran Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Enregistrer l&apos;image en tant que capture d&apos;écran Zotero">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Notes">
diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties
index 59b873cb7a..3559d57d9c 100644
--- a/chrome/locale/fr-FR/zotero/zotero.properties
+++ b/chrome/locale/fr-FR/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Le répertoire que vous avez sélectionné n'es
 
 startupError=Une erreur s'est produite lors du démarrage de Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Voulez-vous vraiment supprimer la collection sélectionnée ?
 pane.collections.deleteSearch=Voulez-vous vraiment supprimer la recherche sélectionnée ?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Élément enregistré
 ingester.scrapeError=Échec de l'enregistrement
 ingester.scrapeErrorDescription=Une erreur s'est produite lors de l'enregistrement de cet élément. Veuillez consulter %s pour davantage de précisions.
 ingester.scrapeErrorDescription.linkText=Problèmes connus de collecteur
-ingester.scrapeError.transactionInProgress.previousError=Le processus de sauvegarde a échoué à cause d'une erreur antérieure de Zotero.
+ingester.scrapeErrorDescription.previousError=Le processus de sauvegarde a échoué à cause d'une erreur antérieure de Zotero.
 
 db.dbCorrupted=La base de données Zotero '%S' semble avoir été corrompue.
 db.dbCorrupted.restart=Veuillez redémarrer Firefox pour tenter une restauration automatique à partir de la dernière sauvegarde.
diff --git a/chrome/locale/gl-ES/zotero/zotero.dtd b/chrome/locale/gl-ES/zotero/zotero.dtd
index 97505c7619..1aa3d77e29 100644
--- a/chrome/locale/gl-ES/zotero/zotero.dtd
+++ b/chrome/locale/gl-ES/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Engadir a selección a unha Nota Zotero">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Crear elemento e nota Zotero a partir da selección">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Gravar Enlace como Instantánea Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Gravar Imaxe como Instantánea Zotero">
 
 <!ENTITY zotero.tabs.info.label "Información">
 <!ENTITY zotero.tabs.notes.label "Notas">
diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties
index dc1e8d006e..1376850ad2 100644
--- a/chrome/locale/gl-ES/zotero/zotero.properties
+++ b/chrome/locale/gl-ES/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=O directorio que seleccionou non está baleiro
 
 startupError=Produciuse un erro ao iniciar Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Está seguro de que desexa eliminar a colección seleccionada?
 pane.collections.deleteSearch=Está seguro de que desexa eliminar a procura seleccionada?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Gravado
 ingester.scrapeError=Non se puido gravar
 ingester.scrapeErrorDescription=Produciuse un erro ao gardalo. Comprobe %S para obter máis información.
 ingester.scrapeErrorDescription.linkText=Cuestións de Tradutor Coñecidas
-ingester.scrapeError.transactionInProgress.previousError=O proceso de gravación fallou debido a un erro previo de Zotero.
+ingester.scrapeErrorDescription.previousError=O proceso de gravación fallou debido a un erro previo de Zotero.
 
 db.dbCorrupted=A base de datos '%S' de Zotero parece haberse corrompido.
 db.dbCorrupted.restart=Reinicie Firefox para intentar un restablecemento automático da última copia de seguridade.
diff --git a/chrome/locale/he-IL/zotero/zotero.dtd b/chrome/locale/he-IL/zotero/zotero.dtd
index fff31d134d..686ae452a7 100644
--- a/chrome/locale/he-IL/zotero/zotero.dtd
+++ b/chrome/locale/he-IL/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Add Selection to Zotero Note">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Create Zotero Item and Note from Selection">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Save Link As Zotero Snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Save Image As Zotero Snapshot">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Notes">
diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties
index bd22b2c559..d6b9f7ca3e 100644
--- a/chrome/locale/he-IL/zotero/zotero.properties
+++ b/chrome/locale/he-IL/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=The directory you selected is not empty and doe
 
 startupError=.Zotero התרחשה שגיאה בעת הפעלת
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=האם ברצונך למחוק את האוסף הנבחר?
 pane.collections.deleteSearch=האם ברצונך למחוק את החיפוש הנבחר?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=פריט נשמר.
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/hr-HR/zotero/zotero.dtd b/chrome/locale/hr-HR/zotero/zotero.dtd
index 0559d9c87d..2b5462f15b 100644
--- a/chrome/locale/hr-HR/zotero/zotero.dtd
+++ b/chrome/locale/hr-HR/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Add Selection to Zotero Note">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Create Zotero Item and Note from Selection">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Save Link As Zotero Snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Save Image As Zotero Snapshot">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Notes">
diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties
index d882f2883c..28040b5f15 100644
--- a/chrome/locale/hr-HR/zotero/zotero.properties
+++ b/chrome/locale/hr-HR/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=The directory you selected is not empty and doe
 
 startupError=There was an error starting Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Are you sure you want to delete the selected collection?
 pane.collections.deleteSearch=Are you sure you want to delete the selected search?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Item Saved
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/hu-HU/zotero/zotero.dtd b/chrome/locale/hu-HU/zotero/zotero.dtd
index 9472027c10..8db580eb09 100644
--- a/chrome/locale/hu-HU/zotero/zotero.dtd
+++ b/chrome/locale/hu-HU/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "A kijelölés hozzáadása a Zotero jegyzethez">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Zotero elem és jegyzet létrehozása a kijelölés alapján">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "A hivatkozás elmentése Zotero pillanatfelvételként">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "A kép elmentése Zotero pillanatfelvételként">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Jegyzetek">
diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties
index 2ce85885ab..cbd4fcbc16 100644
--- a/chrome/locale/hu-HU/zotero/zotero.properties
+++ b/chrome/locale/hu-HU/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=A kiválasztott mappa nem üres és nem tartalm
 
 startupError=Hiba a Zotero indítása közben.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=A kijelölt gyűjtemény törlésének megerősítése?
 pane.collections.deleteSearch=A kijelölt keresés törlésének megerősítése?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Elem elmentve.
 ingester.scrapeError=Elem mentése sikertelen.
 ingester.scrapeErrorDescription=Hiba az elem mentése során. Próbálja meg újra. Ha a hiba továbbra is fenn áll, lépjen kapcsolatba az adatkonverter készítőjével.
 ingester.scrapeErrorDescription.linkText=Ismert konverter hibák
-ingester.scrapeError.transactionInProgress.previousError=A mentés egy korábbi Zotero hiba miatt sikertelen.
+ingester.scrapeErrorDescription.previousError=A mentés egy korábbi Zotero hiba miatt sikertelen.
 
 db.dbCorrupted=A '%S' Zotero adatbázis hibás.
 db.dbCorrupted.restart=Az automatikus visszaállításhoz újra kell indítani a Firefoxot.
diff --git a/chrome/locale/is-IS/zotero/zotero.dtd b/chrome/locale/is-IS/zotero/zotero.dtd
index 0588c07bf5..a2d494dadb 100644
--- a/chrome/locale/is-IS/zotero/zotero.dtd
+++ b/chrome/locale/is-IS/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Add Selection to Zotero Note">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Create Zotero Item and Note from Selection">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Save Link As Zotero Snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Save Image As Zotero Snapshot">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Notes">
diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties
index a9214d04b3..555960be89 100644
--- a/chrome/locale/is-IS/zotero/zotero.properties
+++ b/chrome/locale/is-IS/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=The directory you selected is not empty and doe
 
 startupError=There was an error starting Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Viltu örugglega eyða völd safni?
 pane.collections.deleteSearch=Viltu örugglega eyða valdri leit?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Færsla vistuð
 ingester.scrapeError=Gat ekki vistað færslu.
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/it-IT/zotero/zotero.dtd b/chrome/locale/it-IT/zotero/zotero.dtd
index 82fd248247..a4f7bb8dbe 100644
--- a/chrome/locale/it-IT/zotero/zotero.dtd
+++ b/chrome/locale/it-IT/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Aggiungi la selezione alla nota di Zotero">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Crea elemento e nota in base alla selezione">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Salva collegamento come istantanea di Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Salva immagine come istantanea di Zotero">
 
 <!ENTITY zotero.tabs.info.label "Informazioni">
 <!ENTITY zotero.tabs.notes.label "Note">
diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties
index 5baef89291..a9edc5fd1e 100644
--- a/chrome/locale/it-IT/zotero/zotero.properties
+++ b/chrome/locale/it-IT/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=La cartella selezionata non risulta vuota e non
 
 startupError=Errore in fase di avvio di Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Eliminare la collezione selezionata?
 pane.collections.deleteSearch=Eliminare la ricerca selezionata?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Elemento salvato
 ingester.scrapeError=Impossibile salvare elemento
 ingester.scrapeErrorDescription=Si è verificato un errore durante il salvataggio dell'elemento. Consultare %S per ulteriori informazioni
 ingester.scrapeErrorDescription.linkText=Errore noto del motore di ricerca
-ingester.scrapeError.transactionInProgress.previousError=Processo di salvataggio non riuscito a causa di un precedente errore di Zotero.
+ingester.scrapeErrorDescription.previousError=Processo di salvataggio non riuscito a causa di un precedente errore di Zotero.
 
 db.dbCorrupted=Il database '%S' di Zotero potrebbe essere danneggiato.
 db.dbCorrupted.restart=Riavviare Firefox per tentare un ripristino automatico dell'ultimo backup.
diff --git a/chrome/locale/ja-JP/zotero/zotero.dtd b/chrome/locale/ja-JP/zotero/zotero.dtd
index 679f2e89b3..c49b00371a 100644
--- a/chrome/locale/ja-JP/zotero/zotero.dtd
+++ b/chrome/locale/ja-JP/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "選択範囲をZoteroメモに追加">
 <!ENTITY zotero.contextMenu.addTextToNewNote "選択範囲からZoteroメモを作成">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "リンクをZoteroスナップショットとして保存">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "イメージをZoteroスナップショットとして保存">
 
 <!ENTITY zotero.tabs.info.label "情報">
 <!ENTITY zotero.tabs.notes.label "メモ">
diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties
index c6d66d8535..7558d16ce1 100644
--- a/chrome/locale/ja-JP/zotero/zotero.properties
+++ b/chrome/locale/ja-JP/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=選択されたフォルダが空ではなく
 
 startupError=Zoteroを起動するときにエラーが発生しました。
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=選択されたコレクションを削除してよろしいですか？
 pane.collections.deleteSearch=選択された検索式保存を削除してよろしいですか？
@@ -347,7 +346,7 @@ ingester.scrapeComplete=アイテムを保存しました
 ingester.scrapeError=アイテムを保存できませんでした
 ingester.scrapeErrorDescription=アイテムの保存中にエラーが発生しました。もう一度試してください。それでもエラーが発生する場合、スクレーパの作成者までご連絡ください。
 ingester.scrapeErrorDescription.linkText=既知の翻訳問題
-ingester.scrapeError.transactionInProgress.previousError=以前のZoteroエラーによって保存中にエラーが発生しました。
+ingester.scrapeErrorDescription.previousError=以前のZoteroエラーによって保存中にエラーが発生しました。
 
 db.dbCorrupted=Zoteroの「%S」データベースが破損しているようです。
 db.dbCorrupted.restart=最終のバックアップを自動的に回復するため、Firefoxを再起動してください。
diff --git a/chrome/locale/ko-KR/zotero/zotero.dtd b/chrome/locale/ko-KR/zotero/zotero.dtd
index 277111d7b1..2ff01ba896 100644
--- a/chrome/locale/ko-KR/zotero/zotero.dtd
+++ b/chrome/locale/ko-KR/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Zotero 노트에 선택한 내용 추가">
 <!ENTITY zotero.contextMenu.addTextToNewNote "선택한 내용으로 Zotero 노트 생성">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Zotero 스냅샷을 링크로 저장">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Zotero 스냅샷을 그림으로 저장">
 
 <!ENTITY zotero.tabs.info.label "정보">
 <!ENTITY zotero.tabs.notes.label "노트">
diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties
index 1ca73106ed..89ccc150fa 100644
--- a/chrome/locale/ko-KR/zotero/zotero.properties
+++ b/chrome/locale/ko-KR/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=선택한 디렉토리는 비어 있지 않고
 
 startupError=Zotero 시작중 오류가 존재 합니다.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=선택된 수집품을 삭제하길 원하는게 맞습니까?
 pane.collections.deleteSearch=선택된 검색을 삭제하길 원하는게 맞습니까?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=항목 저장됨.
 ingester.scrapeError=항목을 저장할 수 없습니다.
 ingester.scrapeErrorDescription=항목 저장중 오류가 발생했습니다. 더 많은 정보를 원하면 %S를(을) 확인하세요.
 ingester.scrapeErrorDescription.linkText=알려진 중계기 문제
-ingester.scrapeError.transactionInProgress.previousError=저장 과정이 이전 Zotero의 오류 때문에 실패했습니다.
+ingester.scrapeErrorDescription.previousError=저장 과정이 이전 Zotero의 오류 때문에 실패했습니다.
 
 db.dbCorrupted=Zotero 데이터베이스 '%S'(이)가 훼손된 것 처럼 보입니다.
 db.dbCorrupted.restart=최종 백업본으로 부터 자동 복원을 시도하려면 Firefox를 재시작해 주십시오.
diff --git a/chrome/locale/mn-MN/zotero/zotero.dtd b/chrome/locale/mn-MN/zotero/zotero.dtd
index e6df8ed944..5459732c29 100644
--- a/chrome/locale/mn-MN/zotero/zotero.dtd
+++ b/chrome/locale/mn-MN/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Add Selection to Zotero Note">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Create Zotero Item and Note from Selection">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Save Link As Zotero Snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Save Image As Zotero Snapshot">
 
 <!ENTITY zotero.tabs.info.label "Мэдээлэл">
 <!ENTITY zotero.tabs.notes.label "Тэмдэглэлүүд">
diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties
index f1eb9070ff..1a47e0e046 100644
--- a/chrome/locale/mn-MN/zotero/zotero.properties
+++ b/chrome/locale/mn-MN/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=The directory you selected is not empty and doe
 
 startupError=There was an error starting Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Are you sure you want to delete the selected collection?
 pane.collections.deleteSearch=Are you sure you want to delete the selected search?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=бүтээл хадгалсан
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/nb-NO/zotero/zotero.dtd b/chrome/locale/nb-NO/zotero/zotero.dtd
index b9c7a86717..f9971dddc7 100644
--- a/chrome/locale/nb-NO/zotero/zotero.dtd
+++ b/chrome/locale/nb-NO/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Legg utvalg til Zotero-notat">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Lag notat og element i Zotero fra utvalget">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Lagre lenke som Zotero-snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Lagre bilde som Zotero-snapshot">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Notater">
diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties
index b35ea25fc7..f96804b3bd 100644
--- a/chrome/locale/nb-NO/zotero/zotero.properties
+++ b/chrome/locale/nb-NO/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Mappen du valgte er ikke tom og ser ikke ut til
 
 startupError=Det oppstod en feil ved oppstarten av Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Er du sikker på at du vil slette den valgte samlingen?
 pane.collections.deleteSearch=Er du sikker på at du vil slette det valgte søket?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Element lagret.
 ingester.scrapeError=Kunne ikke lagre element.
 ingester.scrapeErrorDescription=En feil oppsto mens dette elementet ble forsøkt lagret. Se %S for mer informasjon.
 ingester.scrapeErrorDescription.linkText=Kjente feil med oversetteren
-ingester.scrapeError.transactionInProgress.previousError=Lagring mislyktes på grunn av en foregående feil.
+ingester.scrapeErrorDescription.previousError=Lagring mislyktes på grunn av en foregående feil.
 
 db.dbCorrupted=Zotero-databasen '%S' ser ut til å være skadet.
 db.dbCorrupted.restart=Start Firefox på nytt for å forsøke en automatisk gjenoppretting fra den siste sikkerhetskopien.
diff --git a/chrome/locale/nl-NL/zotero/zotero.dtd b/chrome/locale/nl-NL/zotero/zotero.dtd
index 94fea0d588..033487e094 100644
--- a/chrome/locale/nl-NL/zotero/zotero.dtd
+++ b/chrome/locale/nl-NL/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Selectie toevoegen aan Zotero-aantekening">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Zotero-object en -aantekening maken van selectie">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Koppeling opslaan als Zotero-snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Afbeelding opslaan als Zotero-snapshot">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Aantekeningen">
diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties
index 4a4832001f..b72255acfb 100644
--- a/chrome/locale/nl-NL/zotero/zotero.properties
+++ b/chrome/locale/nl-NL/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=De map die u selecteerde is niet leeg and lijkt
 
 startupError=Er is een fout opgetreden bij het starten van Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Wilt u de geselecteerde verzameling verwijderen?
 pane.collections.deleteSearch=Wilt u de geselecteerde zoekopdracht verwijderen?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Object opgeslagen
 ingester.scrapeError=Object kon niet opgeslagen worden.
 ingester.scrapeErrorDescription=Er is een fout opgetreden bij het opslaan van dit object. Bekijk %S voor meer informatie.
 ingester.scrapeErrorDescription.linkText=Bekende problemen met vertalers
-ingester.scrapeError.transactionInProgress.previousError=Het opslaan is mislukt door een eerdere Zotero fout.
+ingester.scrapeErrorDescription.previousError=Het opslaan is mislukt door een eerdere Zotero fout.
 
 db.dbCorrupted=De Zotero database '%S' is beschadigd geraakt.
 db.dbCorrupted.restart=Herstart Firefox om een automatische herstelling vanuit de laatste backup te proberen.
diff --git a/chrome/locale/pl-PL/zotero/zotero.dtd b/chrome/locale/pl-PL/zotero/zotero.dtd
index 47fcd41c22..8f7f77175e 100644
--- a/chrome/locale/pl-PL/zotero/zotero.dtd
+++ b/chrome/locale/pl-PL/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Dodaj zaznaczenie do notatki Zotero">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Utwórz element Zotero i notatkę z zaznaczenia">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Zapisz odnośnik jako zrzut ekranu Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Zapisz obraz jako zrzut ekranu Zotero">
 
 <!ENTITY zotero.tabs.info.label "Informacje">
 <!ENTITY zotero.tabs.notes.label "Notatki">
diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties
index 591767596a..5543772359 100644
--- a/chrome/locale/pl-PL/zotero/zotero.properties
+++ b/chrome/locale/pl-PL/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Wybrany katalog zawiera elementy i nie jest kat
 
 startupError=Pojawił się błąd podczas uruchamiania Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Czy na pewno chcesz usunąć zaznaczoną kolekcję?
 pane.collections.deleteSearch=Czy na pewno chcesz usunąć zaznaczone wyszukiwanie?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Element zapisano.
 ingester.scrapeError=Nie można zapisać elementu.
 ingester.scrapeErrorDescription=Podczas zapisywania tego elementu wystąpił błąd. Aby uzyskać więcej informacji zobacz %S.
 ingester.scrapeErrorDescription.linkText=Znane błędy translacji
-ingester.scrapeError.transactionInProgress.previousError=Zapisywanie nie powiodło się z powodu wcześniejszego błędu Zotero.
+ingester.scrapeErrorDescription.previousError=Zapisywanie nie powiodło się z powodu wcześniejszego błędu Zotero.
 
 db.dbCorrupted=Baza danych Zotero "%S" jest prawdopodobnie uszkodzona.
 db.dbCorrupted.restart=Proszę uruchomić ponownie Firefoksa, aby spróbować odzyskać danych z ostatniej kopi zapasowej.
diff --git a/chrome/locale/pt-BR/zotero/zotero.dtd b/chrome/locale/pt-BR/zotero/zotero.dtd
index 591438db64..048eadd425 100644
--- a/chrome/locale/pt-BR/zotero/zotero.dtd
+++ b/chrome/locale/pt-BR/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Adicionar seleção para nota do Zotero">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Criar item no Zotero e nota da seleção">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Salvar link como imagem do Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Salvar imagem como imagem do Zotero">
 
 <!ENTITY zotero.tabs.info.label "Informação">
 <!ENTITY zotero.tabs.notes.label "Notas">
diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties
index f21c24fa4c..76e969779a 100644
--- a/chrome/locale/pt-BR/zotero/zotero.properties
+++ b/chrome/locale/pt-BR/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=The directory you selected is not empty and doe
 
 startupError=There was an error starting Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Você deseja apagar a coleção selecionada?
 pane.collections.deleteSearch=Você deseja apagar a pesquisa selecionada?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Item salvo.
 ingester.scrapeError=Não foi possível salvar item.
 ingester.scrapeErrorDescription=Um erro ocorreu enquanto salvava item. Por favor, tente de novo. Se o erro persistir, contate o autor tradutor.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/pt-PT/zotero/zotero.dtd b/chrome/locale/pt-PT/zotero/zotero.dtd
index c9ffc4cfa4..18ead9ed59 100644
--- a/chrome/locale/pt-PT/zotero/zotero.dtd
+++ b/chrome/locale/pt-PT/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Adicionar Selecção a Nota Zotero">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Criar um Item e Nota Zotero a partir de uma Selecção">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Guardar a Ligação Como Uma Captura Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Guardar a Imagem Como Uma Captura Zotero">
 
 <!ENTITY zotero.tabs.info.label "Informação">
 <!ENTITY zotero.tabs.notes.label "Notas">
diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties
index a4d5c0a74a..254e0f7eb3 100644
--- a/chrome/locale/pt-PT/zotero/zotero.properties
+++ b/chrome/locale/pt-PT/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=A pasta que escolheu não está vazia e não pa
 
 startupError=Ocorreu um erro ao iniciar o Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Quer mesmo remover a colecção seleccionada?
 pane.collections.deleteSearch=Quer mesmo remover a procura seleccionada?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Item Guardado
 ingester.scrapeError=Impossível Guardar Item
 ingester.scrapeErrorDescription=Ocorreu um erro ao guardar este item. Consulte %S para mais informação.
 ingester.scrapeErrorDescription.linkText=Problemas de Tradução Conhecidos
-ingester.scrapeError.transactionInProgress.previousError=Não foi possível guardar devido a um erro anterior no Zotero.
+ingester.scrapeErrorDescription.previousError=Não foi possível guardar devido a um erro anterior no Zotero.
 
 db.dbCorrupted=A base de dados '%S' parece estar corrompida.
 db.dbCorrupted.restart=Por favor reinicie o Firefox para que uma recuperação da última cópia de segurança seja tentada.
diff --git a/chrome/locale/ro-RO/zotero/zotero.dtd b/chrome/locale/ro-RO/zotero/zotero.dtd
index 8445c16179..e2dc7f3335 100644
--- a/chrome/locale/ro-RO/zotero/zotero.dtd
+++ b/chrome/locale/ro-RO/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Adaugă selecţia la nota Zotero">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Creează pe baza selecţiei o înregistrare şi o notă Zotero">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Salvează legătura ca instantaneu Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Salvează imaginea ca instantaneu Zotero">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Note">
diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties
index 5b390bb2f4..41ef53ccec 100644
--- a/chrome/locale/ro-RO/zotero/zotero.properties
+++ b/chrome/locale/ro-RO/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Dosarul pe care l-ai selectat nu e gol şi nu p
 
 startupError=S-a produs o eroare la pornirea lui Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Eşti sigur că vrei să ştergi colecţia selectată?
 pane.collections.deleteSearch=Eşti sigur că vrei să ştergi căutarea selectată?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Înregistrare salvată
 ingester.scrapeError=Înregistrarea n-a putut fi salvată
 ingester.scrapeErrorDescription=A apărut o eroare în timpul salvării acestei înregistrări. Controlaţi %S pentru mai multe informaţii.
 ingester.scrapeErrorDescription.linkText=Alte traduceri ale traducătorului
-ingester.scrapeError.transactionInProgress.previousError=Procesul de salvare a eşuat din cauza unei erori anterioare din Zotero.
+ingester.scrapeErrorDescription.previousError=Procesul de salvare a eşuat din cauza unei erori anterioare din Zotero.
 
 db.dbCorrupted=Baza de date '%S' din Zotero pare coruptă.
 db.dbCorrupted.restart=Reporneşte Firefox, te rog, pentru a permite o restaurare automată din ultimul backup.
diff --git a/chrome/locale/ru-RU/zotero/zotero.dtd b/chrome/locale/ru-RU/zotero/zotero.dtd
index 8672df008b..56e6eddd41 100644
--- a/chrome/locale/ru-RU/zotero/zotero.dtd
+++ b/chrome/locale/ru-RU/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Добавить выделенное к Заметкам Zotero">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Создать документ и заметку Zotero из выделенного">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Сохранить ссылку как снимок Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Сохранить изображение как снимок Zotero">
 
 <!ENTITY zotero.tabs.info.label "Информация">
 <!ENTITY zotero.tabs.notes.label "Заметки">
diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties
index 401f0d4381..465031ae53 100644
--- a/chrome/locale/ru-RU/zotero/zotero.properties
+++ b/chrome/locale/ru-RU/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Папка, которую Вы выбрали
 
 startupError=Прозошла ошибка при запуске Zotero
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Вы уверены, что хотите удалить выбранную подборку?
 pane.collections.deleteSearch=Вы уверены, что хотите удалить выбранный поиск?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Документ сохранен.
 ingester.scrapeError=Невозможно сохранить документ.
 ingester.scrapeErrorDescription=Произошла ошибка при сохранении этого документа. Смотрите %S для дополнительной информации.
 ingester.scrapeErrorDescription.linkText=Известные проблемы транслятора
-ingester.scrapeError.transactionInProgress.previousError=Процесс сохранения незавершен из-за предыдущей ошибки Zotero
+ingester.scrapeErrorDescription.previousError=Процесс сохранения незавершен из-за предыдущей ошибки Zotero
 
 db.dbCorrupted=Видимо, '%S' база данных Zotero повреждена
 db.dbCorrupted.restart=Перезапустите Firefox, чтобы попытаться автоматически восстановить последнюю резервную копию
diff --git a/chrome/locale/sk-SK/zotero/zotero.dtd b/chrome/locale/sk-SK/zotero/zotero.dtd
index 9fa8579135..93e704e5f8 100644
--- a/chrome/locale/sk-SK/zotero/zotero.dtd
+++ b/chrome/locale/sk-SK/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Pridajte výber do Zotera ako poznámku">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Pridajte výber do Zotera ako novú položku a poznámku">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Uložte odkaz do Zotera ako snímku">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Uložte obrázok do Zotera ako snímku.">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Poznámky">
diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties
index c2d33cf852..243ac79d83 100644
--- a/chrome/locale/sk-SK/zotero/zotero.properties
+++ b/chrome/locale/sk-SK/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Zvolený priečinok nie je prázdny a nevyzerá
 
 startupError=Pri spúštaní Zotera sa vyskytla chyba.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Naozaj chcete vymazať vybranú kolekciu?
 pane.collections.deleteSearch=Naozaj chcete vymazať vybrané vyhľadávanie?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Položka uložená
 ingester.scrapeError=Nemôžem uložiť položku
 ingester.scrapeErrorDescription=Pri ukladaní položky sa vyskytla chyba. Viac informácii nájdete kliknutím sem %S.
 ingester.scrapeErrorDescription.linkText=Známe problémy s konvertormi
-ingester.scrapeError.transactionInProgress.previousError=Kvôli predchádzajúcej chybe Zotera ukladanie zlyhalo.
+ingester.scrapeErrorDescription.previousError=Kvôli predchádzajúcej chybe Zotera ukladanie zlyhalo.
 
 db.dbCorrupted=Zdá sa, že došlo k porušeniu Zotero databázy '%S'.
 db.dbCorrupted.restart=Prosím, reštartujte Firefox aby bolo možné pokúsiť sa o automatickú obnovu z poslednej zálohy.
diff --git a/chrome/locale/sl-SI/zotero/zotero.dtd b/chrome/locale/sl-SI/zotero/zotero.dtd
index c3e1f29f2d..de843a12da 100644
--- a/chrome/locale/sl-SI/zotero/zotero.dtd
+++ b/chrome/locale/sl-SI/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Dodaj izbor v opombo Zotero">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Ustvari vnos in opombo Zotero iz izbora">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Shrani povezavo kot posnetek Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Shrani sliko kot posnetek Zotero">
 
 <!ENTITY zotero.tabs.info.label "Podatki">
 <!ENTITY zotero.tabs.notes.label "Opombe">
diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties
index 10f6693356..82f7c0472d 100644
--- a/chrome/locale/sl-SI/zotero/zotero.properties
+++ b/chrome/locale/sl-SI/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Mapa, ki ste jo izbrali, ni prazna in ni podatk
 
 startupError=Pri zagonu Zotera je prišlo do napake.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Ste prepričani, da želite izbrisati izbrano zbirko?
 pane.collections.deleteSearch=Ste prepričani, da želite izbrisati izbrano iskanje?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Vnos shranjen
 ingester.scrapeError=Vnosa ni mogoče shraniti
 ingester.scrapeErrorDescription=Napaka pri shranjevanju tega vnosa. Preverite %S za več podatkov.
 ingester.scrapeErrorDescription.linkText=Znane težave prevajalnikov
-ingester.scrapeError.transactionInProgress.previousError=Postopek shranjevanja ni uspel zaradi prejšnje napake Zotero.
+ingester.scrapeErrorDescription.previousError=Postopek shranjevanja ni uspel zaradi prejšnje napake Zotero.
 
 db.dbCorrupted=Zbirka podatkov Zotero '%S' je očitno poškodovana.
 db.dbCorrupted.restart=Ponovno zaženite Firefox, da sprožite samodejno obnovitev iz zadnje varnostne kopije.
diff --git a/chrome/locale/sr-RS/zotero/zotero.dtd b/chrome/locale/sr-RS/zotero/zotero.dtd
index d0cb4a0847..bf125c337e 100644
--- a/chrome/locale/sr-RS/zotero/zotero.dtd
+++ b/chrome/locale/sr-RS/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Додај назначено у Зотеро белешке">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Направи Зотеро ставку и белешку из назначеног">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Сачувај везу као Зотеро снимак">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Сачувај слику као Зотеро снимак">
 
 <!ENTITY zotero.tabs.info.label "Инфо">
 <!ENTITY zotero.tabs.notes.label "Белешке">
diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties
index 386017694b..79bf70ea06 100644
--- a/chrome/locale/sr-RS/zotero/zotero.properties
+++ b/chrome/locale/sr-RS/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Директоријум који сте иза
 
 startupError=Дошло је до грешке приликом покретања Зотера.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Да ли сте сигурни да желите избрисати изабране збирке?
 pane.collections.deleteSearch=Да ли сте сигурни да желите избрисати изабране претраге?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Ставка сачувана.
 ingester.scrapeError=Нисам могао сачувати ставку.
 ingester.scrapeErrorDescription=Грешка је начињена током чувања ове ставке. Погледајте %S за више података.
 ingester.scrapeErrorDescription.linkText=Познати проблеми преводиоца
-ingester.scrapeError.transactionInProgress.previousError=Процес чувања није успео због предходне грешке у Зотеру.
+ingester.scrapeErrorDescription.previousError=Процес чувања није успео због предходне грешке у Зотеру.
 
 db.dbCorrupted=Зотеро база података „%S“ изгледа оштећена.
 db.dbCorrupted.restart=Поново покрените Firefox да би покушали самостални повраћај података из најновије резерве.
diff --git a/chrome/locale/sv-SE/zotero/zotero.dtd b/chrome/locale/sv-SE/zotero/zotero.dtd
index caa4b10945..8b8544856c 100644
--- a/chrome/locale/sv-SE/zotero/zotero.dtd
+++ b/chrome/locale/sv-SE/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Lägg till det valda som en Zotero-anteckning">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Skapa en Zotero-post och anteckning av det valda">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Spara länk som Zotero-snapshot">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Spara bild som Zotero-snapshot">
 
 <!ENTITY zotero.tabs.info.label "Info">
 <!ENTITY zotero.tabs.notes.label "Anteckningar">
diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties
index 13dbf47c86..7d546fefff 100644
--- a/chrome/locale/sv-SE/zotero/zotero.properties
+++ b/chrome/locale/sv-SE/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Katalogen du valt är inte tom eller verkar int
 
 startupError=Det inträffade ett fel när Zotero startades.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Är du säker på att du vill ta bort den valda samlingen?
 pane.collections.deleteSearch=Är du säker på att du vill ta bort den valda sökningen?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Post sparad
 ingester.scrapeError=Posten kunde inte sparas
 ingester.scrapeErrorDescription=Ett fel uppstod när posten skulle spara. Se %S för mer information.
 ingester.scrapeErrorDescription.linkText=Kända problem med översättare
-ingester.scrapeError.transactionInProgress.previousError=Sparprocessen misslyckades p.g.a. ett tidigare Zotero-fel.
+ingester.scrapeErrorDescription.previousError=Sparprocessen misslyckades p.g.a. ett tidigare Zotero-fel.
 
 db.dbCorrupted=Zotero-databasen '%S' verkar ha korrumperats.
 db.dbCorrupted.restart=Var vänlig starta om Firefox för att försöka automatisk återställning från den senaste säkerhetskopian.
diff --git a/chrome/locale/th-TH/zotero/zotero.dtd b/chrome/locale/th-TH/zotero/zotero.dtd
index 5fbeeecffe..825b17cb69 100644
--- a/chrome/locale/th-TH/zotero/zotero.dtd
+++ b/chrome/locale/th-TH/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Add Selection to Zotero Note">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Create Zotero Item and Note from Selection">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "บันทึกลิ้งค์เป็นโซแทโรสแนบช็อต">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "บันทึกภาพเป็นโซแทรโรสแนบช็อต">
 
 <!ENTITY zotero.tabs.info.label "ข้อมูล">
 <!ENTITY zotero.tabs.notes.label "โน้ต">
diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties
index 72380beab6..f9d2e63ef7 100644
--- a/chrome/locale/th-TH/zotero/zotero.properties
+++ b/chrome/locale/th-TH/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=ไดเรคทอรีที่ท่า
 
 startupError=เกิดข้อผิดพลาดในขณะเริ่มต้นโซแทโร
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=ท่านต้องการลบคอลเลคชันที่เลือกไว้ใช่หรือไม่?
 pane.collections.deleteSearch=ท่านต้องการลบผลการค้นหาที่เลือกไว้ใช่หรือไม่?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Item Saved
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
 ingester.scrapeErrorDescription.linkText=Known Translator Issues
-ingester.scrapeError.transactionInProgress.previousError=The saving process failed due to a previous Zotero error.
+ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
diff --git a/chrome/locale/tr-TR/zotero/zotero.dtd b/chrome/locale/tr-TR/zotero/zotero.dtd
index 6c4be37e56..3a0143f9c3 100644
--- a/chrome/locale/tr-TR/zotero/zotero.dtd
+++ b/chrome/locale/tr-TR/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Seçileni Zotero Not&apos;a Ekle">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Seçimden Zotero öğesi ve Notu Yarat">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Bağlantıyı Zotero Enstantanesi olarak Kaydet">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Resmi Zotero Enstantanesi olarak Kaydet">
 
 <!ENTITY zotero.tabs.info.label "Bilgi">
 <!ENTITY zotero.tabs.notes.label "Notlar">
diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties
index 87e06ff2a8..084a883f12 100644
--- a/chrome/locale/tr-TR/zotero/zotero.properties
+++ b/chrome/locale/tr-TR/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Seçtiğiniz dizin boş değil ve Zotero veri d
 
 startupError=Zotero'yu başlatırken bir hata vardı.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Seçili dermeyi silmek istediğinize emin misiniz?
 pane.collections.deleteSearch=Seçili aramayı silmek istediğinize emin misiniz?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Eser Kaydedildi.
 ingester.scrapeError=Eser Kaydedilemiyor.
 ingester.scrapeErrorDescription=Bu eseri kaydederken bir hata meydana geldi. Lütfen tekrar deneyiniz. Eğer bu hata kalıcı ise, çevirmen ile bağlantıya geçiniz.
 ingester.scrapeErrorDescription.linkText=Bilinen Çevirmen Sorunları
-ingester.scrapeError.transactionInProgress.previousError=Önceki Zotero hatasına göre kayıt işlemi başarısız oldu.
+ingester.scrapeErrorDescription.previousError=Önceki Zotero hatasına göre kayıt işlemi başarısız oldu.
 
 db.dbCorrupted=Zotero veri tabanı '%S' bozulmuş görülüyor.
 db.dbCorrupted.restart=Son yapılan yedekten otomatik geri yüklemek için lütfen Firefox'u yeniden başlatın.
diff --git a/chrome/locale/vi-VN/zotero/zotero.dtd b/chrome/locale/vi-VN/zotero/zotero.dtd
index 55bc6f8e1d..4804da464d 100644
--- a/chrome/locale/vi-VN/zotero/zotero.dtd
+++ b/chrome/locale/vi-VN/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Thêm phần vừa chọn vào một ghi chép Zotero">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Tạo một biểu ghi và một ghi chép Zotero cho phần vừa chọn">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Lưu đường dẫn vào một bản lưu trang Web Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Lưu hình ảnh vào một bản lưu trang Web Zotero">
 
 <!ENTITY zotero.tabs.info.label "Thông tin">
 <!ENTITY zotero.tabs.notes.label "Ghi chép">
diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties
index 71bdb97dd7..8551a9eb01 100644
--- a/chrome/locale/vi-VN/zotero/zotero.properties
+++ b/chrome/locale/vi-VN/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=Thư mục bạn chọn đã có dữ liệu, v
 
 startupError=Đã có một lỗi khi đang khởi động Zotero.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=Bạn có chắc bạn muốn xóa bộ sưu tập đã chọn?
 pane.collections.deleteSearch=Bạn có chắc bạn muốn xóa tìm kiếm đã chọn?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=Biểu ghi đã được lưu dữ
 ingester.scrapeError=Không thể lưu dữ Biểu ghi
 ingester.scrapeErrorDescription=Đã xảy ra một lỗi trong quá trình lưu dữ biểu ghi này. Đọc %S để có thêm thông tin.
 ingester.scrapeErrorDescription.linkText=Các vấn đề đã gặp liên quan đến bộ chuyển đổi
-ingester.scrapeError.transactionInProgress.previousError=Quá trình lưu dữ đã thất bại do một lỗi trước đó trong Zotero.
+ingester.scrapeErrorDescription.previousError=Quá trình lưu dữ đã thất bại do một lỗi trước đó trong Zotero.
 
 db.dbCorrupted=Cơ sở dữ liệu '%S' của Zotero có vẻ đã bị hỏng.
 db.dbCorrupted.restart=Xin vui lòng khởi động lại Firefox để cố gắng phục hồi từ bản dự phòng gần đây nhất.
diff --git a/chrome/locale/zh-CN/zotero/zotero.dtd b/chrome/locale/zh-CN/zotero/zotero.dtd
index 1858293b0e..5b56d51fc2 100644
--- a/chrome/locale/zh-CN/zotero/zotero.dtd
+++ b/chrome/locale/zh-CN/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "将所选内容添至 Zotero 便笺">
 <!ENTITY zotero.contextMenu.addTextToNewNote "由所选内容创建 Zotero 便笺">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "将链接保存为 Zotero 快照">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "将图片保存为 Zotero 快照">
 
 <!ENTITY zotero.tabs.info.label "信息">
 <!ENTITY zotero.tabs.notes.label "便笺">
diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties
index 88fe4832fb..8ded49a5c0 100644
--- a/chrome/locale/zh-CN/zotero/zotero.properties
+++ b/chrome/locale/zh-CN/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=您所选的目录里非空, 但不是一个Zot
 
 startupError=Zotero启动时遇到一个错误.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=确实要删除所选分类吗?
 pane.collections.deleteSearch=确实要删除所选检索?
@@ -347,7 +346,7 @@ ingester.scrapeComplete=条目已存.
 ingester.scrapeError=无法保存条目
 ingester.scrapeErrorDescription=保存此条目时出错. 查看%S以获得更多信息.
 ingester.scrapeErrorDescription.linkText=已知的转换器问题
-ingester.scrapeError.transactionInProgress.previousError=由于上一个Zotero的错误, 存储失败.
+ingester.scrapeErrorDescription.previousError=由于上一个Zotero的错误, 存储失败.
 
 db.dbCorrupted=Zotero数据库 '%S' 似乎已损坏.
 db.dbCorrupted.restart=请重启Firefox以尝试自动从上一备份还原.
diff --git a/chrome/locale/zh-TW/zotero/zotero.dtd b/chrome/locale/zh-TW/zotero/zotero.dtd
index 3d4604342d..1fba921bee 100644
--- a/chrome/locale/zh-TW/zotero/zotero.dtd
+++ b/chrome/locale/zh-TW/zotero/zotero.dtd
@@ -19,8 +19,6 @@
 
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "把選取區加入 Zotero 筆記">
 <!ENTITY zotero.contextMenu.addTextToNewNote "以選取區建立 Zotero 項目與筆記">
-<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "把鏈結存成 Zotero 快照">
-<!ENTITY zotero.contextMenu.saveImageAsSnapshot "把影像存成 Zotero 快照">
 
 <!ENTITY zotero.tabs.info.label "資訊">
 <!ENTITY zotero.tabs.notes.label "筆記">
diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties
index d307a2de7b..a13d1f503e 100644
--- a/chrome/locale/zh-TW/zotero/zotero.properties
+++ b/chrome/locale/zh-TW/zotero/zotero.properties
@@ -51,7 +51,6 @@ dataDir.selectedDirNonEmpty.text=你選擇的目錄不是空的而且它不像
 
 startupError=啟動 Zotero 時發生了錯誤。
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
-startupError.checkPermissions=Please make sure you have read and write permissions to all files in the Zotero data directory.
 
 pane.collections.delete=你確定要刪除選取的收集嗎？
 pane.collections.deleteSearch=你確定要刪除選取的搜尋嗎？
@@ -347,7 +346,7 @@ ingester.scrapeComplete=項目己儲存
 ingester.scrapeError=無法儲存項目
 ingester.scrapeErrorDescription=儲存這個項目時發生了錯誤。可檢查 %S 以取得更多資訊。
 ingester.scrapeErrorDescription.linkText=已知的轉譯器問題
-ingester.scrapeError.transactionInProgress.previousError=因先前 Zotero 的錯誤，儲存程序失敗了。
+ingester.scrapeErrorDescription.previousError=因先前 Zotero 的錯誤，儲存程序失敗了。
 
 db.dbCorrupted=Zotero 的資料庫「%S」似乎已毀損。
 db.dbCorrupted.restart=請重新啟動 Firefox 以嘗試用上次的備份來自動復原。