diff --git a/chrome/content/zotero/about.xul b/chrome/content/zotero/about.xul
index adca886dda..7f06013e23 100644
--- a/chrome/content/zotero/about.xul
+++ b/chrome/content/zotero/about.xul
@@ -51,7 +51,7 @@
 				<label class="zotero-text-link" href="http://www.zotero.org/support/credits_and_acknowledgments" value="&zotero.moreCreditsAndAcknowledgements;"/>
 			</vbox>
 			<vbox id="column2">
-				<label class="subhead" value="Citation &amp; Bibliography Processing"/>
+				<label class="subhead" value="&zotero.citationProcessing;"/>
 				<vbox class="subcontent">
 					<label class="zotero-text-link" href="http://citationstyles.org/" value="Citation Style Language"/>
 					<label class="zotero-text-link" href="http://bitbucket.org/fbennett/citeproc-js/" value="citeproc-js (Frank Bennett)"/>
diff --git a/chrome/content/zotero/bindings/attachmentbox.xml b/chrome/content/zotero/bindings/attachmentbox.xml
index a2cedddc70..a6f902cf1b 100644
--- a/chrome/content/zotero/bindings/attachmentbox.xml
+++ b/chrome/content/zotero/bindings/attachmentbox.xml
@@ -214,7 +214,8 @@
 						
 						// Access date
 						if (this.displayAccessed) {
-							this._id("accessed-label").value = Zotero.getString('itemFields.accessDate')+":";
+							this._id("accessed-label").value = Zotero.getString('itemFields.accessDate')
+								+ Zotero.getString('punctuation.colon');
 							this._id("accessed").value = Zotero.Date.sqlToDate(
 									this.item.getField('accessDate'), true
 								).toLocaleString();
@@ -233,12 +234,11 @@
 					if (this.item.attachmentLinkMode
 								!= Zotero.Attachments.LINK_MODE_LINKED_URL
 							&& this.displayFileName) {
-						// TODO: localize
 						var fileName = this.item.getFilename();
 						
 						if (fileName) {
-							// TODO: localize
-							this._id("fileName-label").value = "Filename:";
+							this._id("fileName-label").value = Zotero.getString('pane.item.attachments.filename')
+								+ Zotero.getString('punctuation.colon');
 							this._id("fileName").value = fileName;
 							fileNameRow.hidden = false;
 						}
@@ -255,8 +255,8 @@
 						var pages = Zotero.Fulltext.getPages(this.item.id);
 						var pages = pages ? pages.total : null;
 						if (pages) {
-							// TODO: localize colon
-							this._id("pages-label").value = Zotero.getString('itemFields.pages') + ':';
+							this._id("pages-label").value = Zotero.getString('itemFields.pages')
+								+ Zotero.getString('punctuation.colon');
 							this._id("pages").value = pages;
 							pagesRow.hidden = false;
 						}
@@ -269,7 +269,8 @@
 					}
 					
 					if (this.displayDateModified) {
-						this._id("dateModified-label").value = Zotero.getString('itemFields.dateModified')+':';
+						this._id("dateModified-label").value = Zotero.getString('itemFields.dateModified')
+							+ Zotero.getString('punctuation.colon');
 						var mtime = this.item.attachmentModificationTime;
 						if (mtime) {
 							this._id("dateModified").value = new Date(mtime).toLocaleString();
@@ -476,7 +477,8 @@
 							str = 'general.yes';
 							break;
 					}
-					this._id("index-status-label").value = Zotero.getString('fulltext.indexState.indexed') + ':';
+					this._id("index-status-label").value = Zotero.getString('fulltext.indexState.indexed')
+						+ Zotero.getString('punctuation.colon');
 					indexStatus.value = Zotero.getString(str);
 					
 					// Reindex button tooltip (string stored in zotero.properties)
diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index c4468a03c7..15cfe3bc68 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -256,8 +256,7 @@
 			<field name="_tabIndexMinCreators" readonly="true">10</field>
 			<field name="_tabIndexMaxCreators">0</field>
 			<field name="_tabIndexMinFields" readonly="true">1000</field>
-			<field name="_tabIndexMaxInfoFields">0</field>
-			<field name="_tabIndexMaxTagsFields">0</field>
+			<field name="_tabIndexMaxFields">0</field>
 			
 			<property name="_defaultFirstName"
 				onget="return '(' + Zotero.getString('pane.item.defaultFirstName') + ')'"/>
@@ -364,7 +363,7 @@
 							// Start tabindex at 1001 after creators
 							var tabindex = fieldIsClickable
 								? (i>0 ? this._tabIndexMinFields + i : 1) : 0;
-							this._tabIndexMaxInfoFields = Math.max(this._tabIndexMaxInfoFields, tabindex);
+							this._tabIndexMaxFields = Math.max(this._tabIndexMaxFields, tabindex);
 							
 							if (fieldIsClickable
 									&& !Zotero.Items.isPrimaryField(fieldName)
@@ -568,7 +567,7 @@
 					// Move to next or previous field if (shift-)tab was pressed
 					if (this._lastTabIndex && this._tabDirection)
 					{
-						this._focusNextField('info', this._dynamicFields, this._lastTabIndex, this._tabDirection == -1);
+						this._focusNextField(this._dynamicFields, this._lastTabIndex, this._tabDirection == -1);
 					}
 				]]>
 				</body>
@@ -741,6 +740,11 @@
 					if (creator.fieldMode) {
 						firstlast.lastChild.setAttribute('hidden', true);
 					}
+					
+					if (this.editable) {
+						firstlast.setAttribute('contextmenu', 'zotero-creator-transform-menu');
+					}
+					
 					this._tabIndexMaxCreators = Math.max(this._tabIndexMaxCreators, tabindex);
 					
 					hbox.appendChild(firstlast);
@@ -1234,10 +1238,6 @@
 							valueText = Zotero.ItemTypes.getLocalizedString(valueText);
 							break;
 						
-						case 'tag':
-							this._tabIndexMaxTagsFields = Math.max(this._tabIndexMaxTagsFields, tabindex);
-							break;
-						
 						// Convert dates from UTC
 						case 'dateAdded':
 						case 'dateModified':
@@ -1366,11 +1366,6 @@
 						var value = c ? c.ref[creatorField] : '';
 						var itemID = this.item.id;
 					}
-					else if (fieldName=='tag') {
-						var tagID = elem.parentNode.getAttribute('id').split('-')[1];
-						var value = tagID ? Zotero.Tags.getName(tagID) : '';
-						var itemID = Zotero.getAncestorByTagName(elem, 'tagsbox').item.id;
-					}
 					else {
 						var value = this.item.getField(fieldName);
 						var itemID = this.item.id;
@@ -1418,8 +1413,7 @@
 					else {
 						// Add auto-complete for certain fields
 						if (Zotero.ItemFields.isAutocompleteField(fieldName)
-								|| fieldName == 'creator'
-								|| fieldName == 'tag') {
+								|| fieldName == 'creator') {
 							t.setAttribute('type', 'autocomplete');
 							t.setAttribute('autocompletesearch', 'zotero');
 							var suffix = itemID ? itemID : '';
@@ -1551,24 +1545,14 @@
 							// DEBUG: what happens if this isn't present?
 							event.preventDefault();
 							
-							if (fieldname == 'tag')
-							{
-								// If last tag row, create new one
-								var row = target.parentNode.parentNode;
-								if (row == row.parentNode.lastChild)
-								{
-									this._tabDirection = 1;
-									var lastTag = true;
-								}
-							}
 							// Shift-enter adds new creator row
-							else if (fieldname.indexOf('creator-') == 0 && event.shiftKey) {
+							if (fieldname.indexOf('creator-') == 0 && event.shiftKey) {
 								// Value hasn't changed
 								if (target.getAttribute('value') == target.value) {
 									Zotero.debug("Value hasn't changed");
 									// If + button is disabled, just focus next creator row
 									if (Zotero.getAncestorByTagName(target, 'row').lastChild.lastChild.disabled) {
-										this._focusNextField('info', this._dynamicFields, this._lastTabIndex, false);
+										this._focusNextField(this._dynamicFields, this._lastTabIndex, false);
 									}
 									else {
 										// TODO: should use current creator type
@@ -1586,11 +1570,9 @@
 							focused.blur();
 							
 							// Return focus to items pane
-							if (!lastTag) {
-								var tree = document.getElementById('zotero-items-tree');
-								if (tree) {
-									tree.focus();
-								}
+							var tree = document.getElementById('zotero-items-tree');
+							if (tree) {
+								tree.focus();
 							}
 							
 							return false;
@@ -1599,14 +1581,8 @@
 							// Reset field to original value
 							target.value = target.getAttribute('value');
 							
-							var tagsbox = Zotero.getAncestorByTagName(focused, 'tagsbox');
-							
 							focused.blur();
 							
-							if (tagsbox) {
-								tagsbox.closePopup();
-							}
-							
 							// Return focus to items pane
 							var tree = document.getElementById('zotero-items-tree');
 							if (tree) {
@@ -1634,7 +1610,7 @@
 				<body>
 				<![CDATA[
 					if (!event.shiftKey) {
-						this.focusFirstField('info');
+						this.focusFirstField();
 						event.preventDefault();
 					}
 					// Shift-tab
@@ -1765,83 +1741,6 @@
 						);
 					}
 					
-					// Tags
-					else if (fieldName=='tag') {
-						var tagsbox = Zotero.getAncestorByTagName(textbox, 'tagsbox');
-						if (!tagsbox)
-						{
-							Zotero.debug('Tagsbox not found', 1);
-							return;
-						}
-						
-						var row = textbox.parentNode;
-						var rows = row.parentNode;
-						
-						// Tag id encoded as 'tag-1234'
-						var id = row.getAttribute('id').split('-')[1];
-						
-						if (saveChanges) {
-							if (id) {
-								if (value) {
-									// If trying to replace with another existing tag
-									// (which causes a delete of the row),
-									// clear the tab direction so we don't advance
-									// when the notifier kicks in
-									var existing = Zotero.Tags.getID(value, 0);
-									if (existing && id != existing)
-									{
-										this._tabDirection = false;
-									}
-									var changed = tagsbox.replace(id, value);
-									if (changed)
-									{
-										return;
-									}
-								}
-								else {
-									tagsbox.remove(id);
-									return;
-								}
-							}
-							// New tag
-							else {
-								// If this is an existing automatic tag, it's going to be
-								// deleted and the number of rows will stay the same,
-								// so we have to compensate
-								var existingTypes = Zotero.Tags.getTypes(value);
-								if (existingTypes && existingTypes.indexOf(1) != -1) {
-									this._lastTabIndex--;
-								}
-								var id = tagsbox.add(value);
-							}
-						}
-						
-						if (id) {
-							elem = this.createValueElement(
-								value,
-								'tag',
-								tabindex
-							);
-						}
-						else {
-							// Just remove the row
-							//
-							// If there's an open popup, this throws NODE CANNOT BE FOUND
-							try {
-								var row = rows.removeChild(row);
-							}
-							catch (e) {}
-							tagsbox.fixPopup();
-							tagsbox.closePopup();
-							
-							this._tabDirection = false;
-							return;
-						}
-						
-						var focusMode = 'tags';
-						var focusBox = tagsbox;
-					}
-					
 					// Fields
 					else {
 						// Access date needs to be parsed and converted to UTC
@@ -1927,11 +1826,8 @@
 					}
 					
 					if (this._tabDirection) {
-						if (!focusMode) {
-							var focusMode = 'info';
-							var focusBox = this._dynamicFields;
-						}
-						this._focusNextField(focusMode, focusBox, this._lastTabIndex, this._tabDirection == -1);
+						var focusBox = this._dynamicFields;
+						this._focusNextField(focusBox, this._lastTabIndex, this._tabDirection == -1);
 					}
 				}
 				// Thrown errors don't seem to show up within XBL without explicit logging
@@ -2214,6 +2110,21 @@
 			</method>
 			
 			
+			<method name="swapNames">
+				<body><![CDATA[
+					var row = Zotero.getAncestorByTagName(document.popupNode, 'row');
+					var typeBox = row.getElementsByAttribute('popup', 'creator-type-menu')[0];
+					var creatorIndex = parseInt(typeBox.getAttribute('fieldname').split('-')[1]);
+					var fields = this.getCreatorFields(row);
+					var lastName = fields.lastName;
+					var firstName = fields.firstName;
+					fields.lastName = firstName;
+					fields.firstName = lastName;
+					this.modifyCreator(creatorIndex, fields);
+					this.item.save();
+				]]></body>
+			</method>
+			
 			<method name="moveCreator">
 				<parameter name="index"/>
 				<parameter name="moveUp"/>
@@ -2260,14 +2171,9 @@
 			
 			
 			<method name="focusFirstField">
-				<parameter name="mode"/>
 				<body>
 				<![CDATA[
-					switch (mode) {
-						case 'info':
-							this._focusNextField('info', this._dynamicFields, 0, false);
-							break;
-					}
+					this._focusNextField(this._dynamicFields, 0, false);
 				]]>
 				</body>
 			</method>
@@ -2282,7 +2188,6 @@
 				completes, so it doesn't know where it's supposed to go next.)
 			-->
 			<method name="_focusNextField">
-				<parameter name="mode"/>
 				<parameter name="box"/>
 				<parameter name="tabindex"/>
 				<parameter name="back"/>
@@ -2292,102 +2197,59 @@
 					
 					if (back)
 					{
-						if (mode=='info')
+						switch (tabindex)
 						{
-							switch (tabindex)
-							{
-								case 1:
-									//Zotero.debug('At beginning');
-									document.getElementById('item-type-menu').focus();
-									return false;
-								
-								case this._tabIndexMinCreators:
+							case 1:
+								//Zotero.debug('At beginning');
+								document.getElementById('item-type-menu').focus();
+								return false;
+							
+							case this._tabIndexMinCreators:
+								var nextIndex = 1; // Title field
+								break;
+							
+							case this._tabIndexMinFields:
+								// No creators
+								if (this._tabIndexMaxCreators == 0) {
 									var nextIndex = 1; // Title field
-									break;
-								
-								case this._tabIndexMinFields:
-									// No creators
-									if (this._tabIndexMaxCreators == 0) {
-										var nextIndex = 1; // Title field
-									}
-									else {
-										var nextIndex = this._tabIndexMaxCreators;
-									}
-									break;
-								
-								default:
-									var nextIndex = tabindex - 1;
-							}
-						}
-						else if (mode=='tags')
-						{
-							switch (tabindex)
-							{
-								case 1:
-									return false;
-								
-								default:
-									var nextIndex = tabindex - 1;
-							}
+								}
+								else {
+									var nextIndex = this._tabIndexMaxCreators;
+								}
+								break;
+							
+							default:
+								var nextIndex = tabindex - 1;
 						}
 					}
 					else
 					{
-						if (mode=='info')
+						switch (tabindex)
 						{
-							switch (tabindex)
-							{
-								case 1:
-									var nextIndex = this._tabIndexMinCreators;
-									break;
-								
-								case this._tabIndexMaxCreators:
-									var nextIndex = this._tabIndexMinFields;
-									break;
-								
-								case this._tabIndexMaxInfoFields:
-									//Zotero.debug('At end');
-									return false;
-								
-								default:
-									var nextIndex = tabindex + 1;
-							}
-						}
-						else if (mode=='tags')
-						{
-							switch (tabindex)
-							{
-								case this._tabIndexMaxTagsFields:
-									// In tags box, keep going to create new row
-									var nextIndex = tabindex + 1;
-									break;
-								
-								default:
-									var nextIndex = tabindex + 1;
-							}
+							case 1:
+								var nextIndex = this._tabIndexMinCreators;
+								break;
+							
+							case this._tabIndexMaxCreators:
+								var nextIndex = this._tabIndexMinFields;
+								break;
+							
+							case this._tabIndexMaxFields:
+								//Zotero.debug('At end');
+								return false;
+							
+							default:
+								var nextIndex = tabindex + 1;
 						}
 					}
 					
 					Zotero.debug('Looking for tabindex ' + nextIndex, 4);
-					switch (mode)
+					
+					var next = box.getElementsByAttribute('ztabindex', nextIndex);
+					if (!next[0])
 					{
-						case 'info':
-							var next = box.getElementsByAttribute('ztabindex', nextIndex);
-							if (!next[0])
-							{
-								//Zotero.debug("Next field not found");
-								return this._focusNextField(mode, box, nextIndex, back);
-							}
-							break;
-						
-						// Tags pane
-						case 'tags':
-							var next = document.getAnonymousNodes(box)[0].
-								getElementsByAttribute('ztabindex', nextIndex);
-							if (!next[0]) {
-								next[0] = box.addDynamicRow();
-							}
-							break;
+						//Zotero.debug("Next field not found");
+						return this._focusNextField(box, nextIndex, back);
 					}
 					
 					next[0].click();
@@ -2481,7 +2343,21 @@
 									oncommand="document.getBindingParent(this).textTransform(document.popupNode, 'sentence')"/>
 							</menupopup>
 						</menu>
-					</menupopup>					
+					</menupopup>
+					<menupopup id="zotero-creator-transform-menu"
+						onpopupshowing="var row = Zotero.getAncestorByTagName(document.popupNode, 'row');
+							var typeBox = row.getElementsByAttribute('popup', 'creator-type-menu')[0];
+							var index = parseInt(typeBox.getAttribute('fieldname').split('-')[1]);
+							var item = document.getBindingParent(this).item;
+							var exists = item.hasCreatorAt(index);
+							if (exists) {
+								var fieldMode = item.getCreator(index).ref.fieldMode;
+							}
+							var hideTransforms = !exists || !!fieldMode;
+							return !hideTransforms;">
+						<menuitem label="&zotero.item.creatorTransform.nameSwap;"
+							oncommand="document.getBindingParent(this).swapNames();"/>
+					</menupopup>
 					<zoteroguidancepanel id="zotero-author-guidance" about="authorMenu" position="after_end" x="-25"/>
 				</popupset>
 				<grid flex="1">
diff --git a/chrome/content/zotero/bindings/merge.xml b/chrome/content/zotero/bindings/merge.xml
index b2dcdb3be1..220b0d3197 100644
--- a/chrome/content/zotero/bindings/merge.xml
+++ b/chrome/content/zotero/bindings/merge.xml
@@ -358,7 +358,7 @@
 						case 'attachment':
 						case 'note':
 						case 'storagefile':
-							objbox.buttonCaption = 'Choose this version';
+							objbox.buttonCaption = Zotero.getString('sync.conflict.chooseThisVersion');
 							break;
 					}
 					
@@ -478,7 +478,7 @@
 				<xul:box id="object-placeholder"/>
 				<xul:hbox id="delete-box" hidden="true" flex="1"
 						onclick="document.getBindingParent(this).chooseObj(this)">
-					<xul:label value="Deleted"/> <!-- TODO: localize -->
+					<xul:label value="&zotero.merge.deleted;"/>
 				</xul:hbox>
 			</xul:groupbox>
 		</content>
diff --git a/chrome/content/zotero/bindings/noteeditor.xml b/chrome/content/zotero/bindings/noteeditor.xml
index b9377ad186..61dee77bdd 100644
--- a/chrome/content/zotero/bindings/noteeditor.xml
+++ b/chrome/content/zotero/bindings/noteeditor.xml
@@ -410,14 +410,14 @@
 			<method name="updateTagsSummary">
 				<body>
 					<![CDATA[
-						// TODO: localize
 						var v = this.id('tags').summary;
 						
 						if (!v || v == "") {
 							v = "[" + Zotero.getString('pane.item.noteEditor.clickHere') + "]";
 						}
 						
-						this.id('tagsLabel').value = Zotero.getString('pane.item.tags');
+						this.id('tagsLabel').value = Zotero.getString('itemFields.tags')
+							+ Zotero.getString('punctuation.colon');
 						this.id('tagsClick').value = v;
 					]]>
 				</body>
@@ -446,7 +446,8 @@
 							v = "[" + Zotero.getString('pane.item.noteEditor.clickHere') + "]";
 						}
 						
-						this.id('seeAlsoLabel').value = Zotero.getString('pane.item.related');
+						this.id('seeAlsoLabel').value = Zotero.getString('itemFields.related')
+							+ Zotero.getString('punctuation.colon');
 						this.id('seeAlsoClick').value = v;
 					]]>
 				</body>
diff --git a/chrome/content/zotero/bindings/relatedbox.xml b/chrome/content/zotero/bindings/relatedbox.xml
index 975c460666..cba1bfbce6 100644
--- a/chrome/content/zotero/bindings/relatedbox.xml
+++ b/chrome/content/zotero/bindings/relatedbox.xml
@@ -289,7 +289,8 @@
 			<xul:vbox xbl:inherits="flex" class="zotero-box">
 				<xul:hbox align="center">
 					<xul:label id="seeAlsoNum"/>
-					<xul:button id="addButton" label="&zotero.item.add;" oncommand="this.parentNode.parentNode.parentNode.add();" hidden="true"/>
+					<xul:button id="addButton" label="&zotero.item.add;"
+						oncommand="this.parentNode.parentNode.parentNode.add();"/>
 				</xul:hbox>
 				<xul:grid flex="1">
 					<xul:columns>
diff --git a/chrome/content/zotero/bindings/styled-textbox.xml b/chrome/content/zotero/bindings/styled-textbox.xml
index 7a63f59de2..e227110847 100644
--- a/chrome/content/zotero/bindings/styled-textbox.xml
+++ b/chrome/content/zotero/bindings/styled-textbox.xml
@@ -355,6 +355,9 @@
 							.getService(Components.interfaces.nsIChromeRegistry);
 					uri = cr.convertChromeURL(uri);
 					
+					// Pass directionality (LTR/RTL) in URL
+					uri.spec += "?dir=" + Zotero.dir;
+					
 					Zotero.debug("Loading " + uri.spec);
 					
 					// Register handler for deferred setting of content
diff --git a/chrome/content/zotero/bindings/tagsbox.xml b/chrome/content/zotero/bindings/tagsbox.xml
index a6c7017216..4a5630ee71 100644
--- a/chrome/content/zotero/bindings/tagsbox.xml
+++ b/chrome/content/zotero/bindings/tagsbox.xml
@@ -36,6 +36,9 @@
 		
 		<implementation>
 			<field name="clickHandler"/>
+			
+			<field name="_lastTabIndex">false</field>
+			<field name="_tabDirection"/>
 			<field name="_tagColors"/>
 			<field name="_notifierID"/>
 			
@@ -74,6 +77,10 @@
 			<property name="item" onget="return this._item;">
 				<setter>
 					<![CDATA[
+						// Don't reload if item hasn't changed
+						if (this._item == val) {
+							return;
+						}
 						this._item = val;
 						this.reload();
 					]]>
@@ -143,11 +150,14 @@
 			<method name="reload">
 				<body>
 					<![CDATA[
-						var self = this;
 						Zotero.debug('Reloading tags');
-						var addButton = self.id('addButton');
-						addButton.hidden = !self.editable;
 						
+						// Cancel field focusing while we're updating
+						this._reloading = true;
+						
+						this.id('addButton').hidden = !this.editable;
+						
+						var self = this;
 						return Zotero.Tags.getColors(self.item.libraryIDInt)
 						.then(function (colors) {
 							self._tagColors = colors;
@@ -161,11 +171,12 @@
 								for (var i=0; i<tags.length; i++) {
 									self.addDynamicRow(tags[i], i+1);
 								}
-								
-								//self.fixPopup();
 							}
 							
 							self.updateCount(0);
+							
+							self._reloading = false;
+							self._focusField();
 						})
 						.done();
 					]]>
@@ -187,49 +198,23 @@
 							name = '';
 						}
 						
-						if (!tabindex)
-						{
-							if (this.id('tagRows').lastChild)
-							{
-								tabindex = parseInt(this.id('tagRows').lastChild.
-									firstChild.nextSibling.getAttribute('ztabindex')) + 1;
-							}
-							else {
-								tabindex = 1;
-							}
+						if (!tabindex) {
+							tabindex = this.id('tagRows').childNodes.length + 1;
 						}
 						
 						var icon = document.createElement("image");
 						icon.className = "zotero-box-icon";
-						var iconFile = 'tag';
-						if (type == 0) {
-							icon.setAttribute('tooltiptext', Zotero.getString('pane.item.tags.icon.user'));
-						}
-						else if (type == 1) {
-							iconFile += '-automatic';
-							icon.setAttribute('tooltiptext', Zotero.getString('pane.item.tags.icon.automatic'));
-						}
-						icon.setAttribute('src', 'chrome://zotero/skin/' + iconFile + '.png');
 						
 						// DEBUG: Why won't just this.nextSibling.blur() work?
 						icon.setAttribute('onclick','if (this.nextSibling.inputField){ this.nextSibling.inputField.blur() }');
 						
 						var label = this.createValueElement(name, tabindex);
-						label.className = "zotero-box-label";
 						
 						if (this.editable) {
 							var remove = document.createElement("label");
 							remove.setAttribute('value','-');
 							remove.setAttribute('class','zotero-clicky zotero-clicky-minus');
-							if (tagID)
-							{
-								remove.setAttribute('ztabindex', -1);
-								remove.setAttribute('onclick',"document.getBindingParent(this).remove('"+ tagID +"');");
-							}
-							else
-							{
-								remove.setAttribute('disabled', true);
-							}
+							remove.setAttribute('tabindex', -1);
 						}
 						
 						var row = document.createElement("row");
@@ -239,19 +224,73 @@
 							row.appendChild(remove);
 						}
 						
-						if (tagID)
-						{
-							row.setAttribute('id', 'tag-' + tagID);
-							row.setAttribute('tagType', type);
-						}
+						this.updateRow(row, tagObj, tabindex);
 						
 						this.id('tagRows').appendChild(row);
+						
 						return row;
 					]]>
 				</body>
 			</method>
 			
 			
+			<method name="updateRow">
+				<parameter name="row"/>
+				<parameter name="tagObj"/>
+				<parameter name="tabindex"/>
+				<body><![CDATA[
+					if (tagObj) {
+						var tagID = tagObj.id;
+						var type = tagObj.type;
+					}
+					
+					var icon = row.firstChild;
+					var label = row.firstChild.nextSibling;
+					if (this.editable) {
+						var remove = row.lastChild;
+					}
+					
+					// Row
+					if (tagObj) {
+						row.setAttribute('id', 'tag-' + tagID);
+						row.setAttribute('tagType', type);
+					}
+					
+					// Icon
+					var iconFile = 'tag';
+					if (type == 0) {
+						icon.setAttribute('tooltiptext', Zotero.getString('pane.item.tags.icon.user'));
+					}
+					else if (type == 1) {
+						iconFile += '-automatic';
+						icon.setAttribute('tooltiptext', Zotero.getString('pane.item.tags.icon.automatic'));
+					}
+					icon.setAttribute('src', 'chrome://zotero/skin/' + iconFile + '.png');
+					
+					// "-" button
+					if (this.editable) {
+						if (tagID) {
+							remove.setAttribute('disabled', false);
+							var self = this;
+							remove.addEventListener('click', function () {
+								self._lastTabIndex = false;
+								document.getBindingParent(this).remove(tagID);
+								
+								// Return focus to items pane
+								var tree = document.getElementById('zotero-items-tree');
+								if (tree) {
+									tree.focus();
+								}
+							});
+						}
+						else {
+							remove.setAttribute('disabled', true);
+						}
+					}
+				]]></body>
+			</method>
+			
+			
 			<method name="createValueElement">
 				<parameter name="valueText"/>
 				<parameter name="tabindex"/>
@@ -260,6 +299,7 @@
 					var valueElement = document.createElement("label");
 					valueElement.setAttribute('fieldname', 'tag');
 					valueElement.setAttribute('flex', 1);
+					valueElement.className = 'zotero-box-label';
 					
 					if (this.clickable) {
 						valueElement.setAttribute('ztabindex', tabindex);
@@ -270,11 +310,9 @@
 							}
 							document.getBindingParent(this).clickHandler(this);
 						}, false);
-						valueElement.className = 'zotero-clicky';
+						valueElement.className += ' zotero-clicky';
 					}
 					
-					this._tabIndexMaxTagsFields = Math.max(this._tabIndexMaxTagsFields, tabindex);
-					
 					var firstSpace;
 					if (typeof valueText == 'string') {
 						firstSpace = valueText.indexOf(" ");
@@ -308,6 +346,8 @@
 			
 			<method name="showEditor">
 				<parameter name="elem"/>
+				<parameter name="rows"/>
+				<parameter name="value"/>
 				<body>
 				<![CDATA[
 					// Blur any active fields
@@ -323,7 +363,9 @@
 					var tabindex = elem.getAttribute('ztabindex');
 					
 					var tagID = elem.parentNode.getAttribute('id').split('-')[1];
-					var value = tagID ? Zotero.Tags.getName(tagID) : '';
+					if (!value) {
+						var value = tagID ? Zotero.Tags.getName(tagID) : '';
+					}
 					var itemID = Zotero.getAncestorByTagName(elem, 'tagsbox').item.id;
 					
 					var t = document.createElement("textbox");
@@ -331,33 +373,37 @@
 					t.setAttribute('fieldname', fieldName);
 					t.setAttribute('ztabindex', tabindex);
 					t.setAttribute('flex', '1');
-                    t.setAttribute('newlines','pasteintact');
-					
+					t.setAttribute('newlines','pasteintact');
+					// Multi-line
+					if (rows > 1) {
+						t.setAttribute('multiline', true);
+						t.setAttribute('rows', rows);
+					}
 					// Add auto-complete
-					t.setAttribute('type', 'autocomplete');
-					t.setAttribute('autocompletesearch', 'zotero');
-					var suffix = itemID ? itemID : '';
-					t.setAttribute('autocompletesearchparam', fieldName + '/' + suffix);
+					else {
+						t.setAttribute('type', 'autocomplete');
+						t.setAttribute('autocompletesearch', 'zotero');
+						var suffix = itemID ? itemID : '';
+						t.setAttribute('autocompletesearchparam', fieldName + '/' + suffix);
+					}
 					
 					var box = elem.parentNode;
 					box.replaceChild(t, elem);
 					
+					t.setAttribute('onblur', "return document.getBindingParent(this).blurHandler(this)");
+					t.setAttribute('onkeypress', "return document.getBindingParent(this).handleKeyPress(event)");
+					t.setAttribute('onpaste', "return document.getBindingParent(this).handlePaste(event)");
+					
+					this._tabDirection = false;
+					this._lastTabIndex = tabindex;
+					
 					// Prevent error when clicking between a changed field
 					// and another -- there's probably a better way
 					if (!t.select) {
 						return;
 					}
-					
 					t.select();
 					
-					t.addEventListener('blur', function () {
-						document.getBindingParent(this).blurHandler(this);
-					}, false);
-					t.setAttribute('onkeypress', "return document.getBindingParent(this).handleKeyPress(event)");
-					
-					this._tabDirection = false;
-					this._lastTabIndex = tabindex;
-					
 					return t;
 				]]>
 				</body>
@@ -373,23 +419,53 @@
 					
 					switch (event.keyCode) {
 						case event.DOM_VK_RETURN:
+							var multiline = target.getAttribute('multiline');
+							var empty = target.value == "";
+							if (event.shiftKey) {
+								if (!multiline) {
+									var self = this;
+									setTimeout(function () {
+										var val = target.value;
+										if (val !== "") {
+											val += "\n";
+										}
+										self.makeMultiline(target, val, 6);
+									}, 0);
+									return false;
+								}
+								// Submit
+							}
+							else if (multiline) {
+								return true;
+							}
+							
 							var fieldname = 'tag';
 							
-							// Prevent blur on containing textbox
-							// DEBUG: what happens if this isn't present?
-							event.preventDefault();
-							
 							// If last tag row, create new one
-							var row = target.parentNode.parentNode;
-							if (row == row.parentNode.lastChild) {
+							var row = Zotero.getAncestorByTagName(target, 'row');
+							
+							// If non-empty last row, add new row
+							if (row == row.parentNode.lastChild && !empty) {
+								var focusField = true;
 								this._tabDirection = 1;
-								var lastTag = true;
+							}
+							// If empty non-last row, refocus current row
+							else if (row != row.parentNode.lastChild && empty) {
+								var focusField = true;
+							}
+							// If non-empty non-last row, return focus to items pane
+							else {
+								var focusField = false;
+								this._lastTabIndex = false;
 							}
 							
 							focused.blur();
 							
+							if (focusField) {
+								this._focusField();
+							}
 							// Return focus to items pane
-							if (!lastTag) {
+							else {
 								var tree = document.getElementById('zotero-items-tree');
 								if (tree) {
 									tree.focus();
@@ -400,10 +476,16 @@
 							
 						case event.DOM_VK_ESCAPE:
 							// Reset field to original value
-							target.value = target.getAttribute('value');
+							if (target.getAttribute('multiline')) {
+								target.value = "";
+							}
+							else {
+								target.value = target.getAttribute('value');
+							}
 							
 							var tagsbox = Zotero.getAncestorByTagName(focused, 'tagsbox');
 							
+							this._lastTabIndex = false;
 							focused.blur();
 							
 							if (tagsbox) {
@@ -419,8 +501,17 @@
 							return false;
 							
 						case event.DOM_VK_TAB:
+							// If already an empty last row, ignore forward tab
+							if (target.value == "" && !event.shiftKey) {
+								var row = Zotero.getAncestorByTagName(target, 'row');
+								if (row == row.parentNode.lastChild) {
+									return false;
+								}
+							}
+							
 							this._tabDirection = event.shiftKey ? -1 : 1;
 							focused.blur();
+							this._focusField();
 							return false;
 					}
 					
@@ -429,6 +520,63 @@
 				</body>
 			</method>
 			
+			<!--
+				Intercept paste, check for newlines, and convert textbox
+				to multiline if necessary
+			-->
+			<method name="handlePaste">
+				<parameter name="event"/>
+				<body>
+				<![CDATA[
+					var textbox = event.target;
+					
+					var clip = Components.classes["@mozilla.org/widget/clipboard;1"]
+						.getService(Components.interfaces.nsIClipboard);
+					var trans = Components.classes["@mozilla.org/widget/transferable;1"]
+						.createInstance(Components.interfaces.nsITransferable);
+					trans.addDataFlavor("text/unicode");
+					clip.getData(trans, clip.kGlobalClipboard);
+					var str = {};
+					try {
+						trans.getTransferData("text/unicode", str, {});
+						str = str.value.QueryInterface(Components.interfaces.nsISupportsString).data;
+					}
+					catch (e) {
+						Zotero.debug(e);
+						return true;
+					}
+					
+					var multiline = !!str.trim().match(/\n/);
+					if (multiline) {
+						var self = this;
+						setTimeout(function () {
+							self.makeMultiline(textbox, str.trim());
+						}, 0);
+						// Cancel paste
+						return false;
+					}
+					
+					return true;
+				]]>
+				</body>
+			</method>
+			
+			
+			<method name="makeMultiline">
+				<parameter name="textbox"/>
+				<parameter name="value"/>
+				<parameter name="rows"/>
+				<body><![CDATA[
+					// If rows not specified, use one more than lines in input
+					if (!rows) {
+						rows = value.match(/\n/g).length + 1;
+					}
+					textbox = this.showEditor(textbox, rows, value);
+					// Move cursor to end
+					textbox.selectionStart = value.length;
+				]]></body>
+			</method>
+			
 			
 			<method name="hideEditor">
 				<parameter name="textbox"/>
@@ -449,7 +597,7 @@
 					
 					var fieldName = 'tag';
 					var tabindex = textbox.getAttribute('ztabindex');
-
+					
 					var value = textbox.value;
 					
 					var tagsbox = Zotero.getAncestorByTagName(textbox, 'tagsbox');
@@ -468,69 +616,74 @@
 					var tagArray = value.split(/\r\n?|\n/);
 					
 					if (saveChanges) {
-						if (id && (tagArray.length < 2)) {
+						// Modifying existing tag
+						if (id && tagArray.length < 2) {
 							if (value) {
-								var origTagIndex = this.item.getTagIndex(id);
-								var changed = tagsbox.replace(id, value);
-								if (changed) {
-									var newTagIndex = this.item.getTagIndex(changed);
-									if (newTagIndex>origTagIndex) {
-										if (this._tabDirection == 1) {
-											this._lastTabIndex--;
-										}
-									}
-									else if (newTagIndex<origTagIndex) {
-										if (this._tabDirection == -1) {
-											this._lastTabIndex++;
-										}
-									}
-								} 
+								var newTagID = tagsbox.replace(id, value);
+								if (newTagID) {
+									id = newTagID;
+								}
+								// Changed tag to existing
 								else if (value != Zotero.Tags.getName(id)) {
 									if (this._tabDirection == 1) {
 										this._lastTabIndex -= 1;
 									}
+									this.reload();
+									return;
 								}
+								else {
+									var unchanged = true;
+								}
+							}
+							// Existing tag cleared
+							else {
+								tagsbox.remove(id);
+								return;
 							}
 						}
-						// New tag
+						// // Multiple tags
+						else if (tagArray.length > 1) {
+							var lastTag = row == row.parentNode.lastChild;
+							
+							Zotero.DB.beginTransaction();
+							
+							// If old tag isn't in array, remove it
+							if (id) {
+								var oldValue = Zotero.Tags.getName(id);
+								if (tagArray.indexOf(oldValue) == -1) {
+									this.item.removeTag(id);
+								}
+							}
+							
+							this.item.addTags(tagArray);
+							
+							Zotero.DB.commitTransaction();
+							
+							// TODO: get tab index right
+							
+							if (lastTag) {
+								this._lastTabIndex = this.item.getTags().length;
+							}
+							
+							this.reload();
+							return;
+						}
+						// Single tag at end
 						else {
-							//Check for newlines or carriage returns used as delimiters
-							//in a series of tags added at once.  Add each tag
-							//separately.
-							if (tagArray.length > 1) {
-								var extremeTag = false;
-								var nextTag = false;
+							id = tagsbox.add(value);
+							// New tag
+							if (id) {
+								// Stay put, since a tag was added above
 								if (this._tabDirection == -1) {
-									if (this._lastTabIndex == 1) {
-										extremeTag = true;
-									} else {
-										nextTag = row.previousSibling.getAttribute('id').split('-')[1];
-									}
-								} else if (this._tabDirection == 1) {
-									if (this._lastTabIndex >= this.item.getTags().length) {
-										extremeTag = true;
-									} else {
-										nextTag = row.nextSibling.getAttribute('id').split('-')[1];
-									}
-								}
-								
-								id = this.item.addTags(tagArray);
-								
-								if (extremeTag) {
-									if (this._tabDirection == 1) {
-										this._lastTabIndex = this.item.getTags().length;
-									} else if (this._tabDirection == -1) {
-										this._lastTabIndex = 2;
-									}
-								} else {
-									this._lastTabIndex = this.item.getTagIndex(nextTag)+1-this._tabDirection;
+									this._tabDirection = false;
 								}
 							}
+							// Already exists
 							else {
-								id = tagsbox.add(value);
-							}
-							if (!id && (this._tabDirection==1)) {
-								this._lastTabIndex--;
+								// Go back one, since we'll remove this below
+								if (this._tabDirection == 1) {
+									this._lastTabIndex--;
+								}
 							}
 						}
 					}
@@ -541,8 +694,55 @@
 							tabindex
 						);
 						
-						var box = textbox.parentNode;
-						box.replaceChild(elem, textbox);
+						var row = textbox.parentNode;
+						row.replaceChild(elem, textbox);
+						
+						this.updateRow(row, Zotero.Tags.get(id), tabindex);
+						
+						if (!unchanged) {
+							// Move row to appropriate place, alphabetically
+							var collation = Zotero.getLocaleCollation();
+							var rows = row.parentNode;
+							var labels = rows.getElementsByAttribute('fieldname', 'tag');
+							
+							rows.removeChild(row);
+							var currentTabIndex = elem.getAttribute('ztabindex');
+							
+							var before = null;
+							var inserted = false;
+							for (var i=0; i<labels.length; i++) {
+								let newTabIndex = i + 1;
+								if (inserted) {
+									labels[i].setAttribute('ztabindex', newTabIndex);
+									continue;
+								}
+								
+								if (collation.compareString(1, value, labels[i].textContent) > 0) {
+									labels[i].setAttribute('ztabindex', newTabIndex);
+									continue;
+								}
+								
+								elem.setAttribute('ztabindex', newTabIndex);
+								rows.insertBefore(row, labels[i].parentNode);
+								inserted = true;
+								
+								// Adjust last tab index
+								if (this._tabDirection == -1) {
+									if (this._lastTabIndex > newTabIndex) {
+										this._lastTabIndex++;
+									}
+								}
+								else if (this._tabDirection == 1) {
+									if (this._lastTabIndex < newTabIndex) {
+										this._lastTabIndex--;
+									}
+								}
+							}
+							if (!inserted) {
+								elem.setAttribute('ztabindex', i + 1);
+								rows.appendChild(row);
+							}
+						}
 					}
 					else {
 						// Just remove the row
@@ -553,12 +753,6 @@
 						}
 						catch (e) {}
 					}
-					
-					var focusBox = tagsbox;
-					
-					if (this._tabDirection) {
-						this._focusNextField(focusBox, this._lastTabIndex, this._tabDirection == -1);
-					}
 				]]>
 				</body>
 			</method>
@@ -569,6 +763,7 @@
 					<![CDATA[
 						var row = this.addDynamicRow();
 						row.firstChild.nextSibling.click();
+						return row;
 					]]>
 				</body>
 			</method>
@@ -648,29 +843,6 @@
 				</body>
 			</method>
 			
-			
-			<!-- No longer used -->
-			<method name="fixPopup">
-				<body>
-					<![CDATA[
-						// Hack to fix popup close problems after using
-						// autocomplete -- something to do with the popup used
-						// in the XBL autocomplete binding?
-						//
-						// We reset the popup manually if it's showing
-						if (this.parentNode.getAttribute('showing')=='true'){
-							//Zotero.debug('Fixing popup');
-							// The target element is 'tagsLabel', so change the
-							// path if the XUL DOM in the note editor XBL changes
-							this.parentNode.showPopup(
-								this.parentNode.parentNode.previousSibling,
-								-1, -1, 'popup');
-						}
-					]]>
-				</body>
-			</method>
-			
-			
 			<method name="closePopup">
 				<body>
 					<![CDATA[
@@ -683,69 +855,101 @@
 			
 			
 			<!-- 
-				Advance the field focus forward or backward
+				Open the textbox for a particular label
 				
 				Note: We're basically replicating the built-in tabindex functionality,
 				which doesn't work well with the weird label/textbox stuff we're doing.
 				(The textbox being tabbed away from is deleted before the blur()
 				completes, so it doesn't know where it's supposed to go next.)
 			-->
-			<method name="_focusNextField">
-				<parameter name="box"/>
-				<parameter name="tabindex"/>
-				<parameter name="back"/>
+			<method name="_focusField">
 				<body>
 				<![CDATA[
-					tabindex = parseInt(tabindex);
-					if (back) {
-						switch (tabindex) {
-							case 1:
-								return false;
-							
-							default:
-								var nextIndex = tabindex - 1;
+					if (this._reloading) {
+						return;
+					}
+					
+					if (this._lastTabIndex === false) {
+						return;
+					}
+					
+					var maxIndex = this.id('tagRows').childNodes.length + 1;
+					
+					var tabindex = parseInt(this._lastTabIndex);
+					var dir = this._tabDirection;
+					
+					if (dir == 1) {
+						var nextIndex = tabindex + 1;
+					}
+					else if (dir == -1) {
+						if (tabindex == 1) {
+							// Focus Add button
+							this.id('addButton').focus();
+							return false;
 						}
+						var nextIndex = tabindex - 1;
 					}
 					else {
-						switch (tabindex) {
-							case this._tabIndexMaxTagsFields:
-								// In tags box, keep going to create new row
-								var nextIndex = tabindex + 1;
-								break;
-							
-							default:
-								var nextIndex = tabindex + 1;
-						}
+						var nextIndex = tabindex;
 					}
 					
+					nextIndex = Math.min(nextIndex, maxIndex);
+					
 					Zotero.debug('Looking for tabindex ' + nextIndex, 4);
 					
-					var next = document.getAnonymousNodes(box)[0].
-						getElementsByAttribute('ztabindex', nextIndex);
-					if (!next[0]) {
-						next[0] = box.addDynamicRow();
-					}
-					
-					next[0].click();
-					
-					// DEBUG: next[0] is always equal to the target element,
-					// but for some reason it's necessary to scroll to the next
-					// element when moving forward for the target element to
-					// be fully in view
-					if (!back && next[0].parentNode.nextSibling) {
-						var visElem = next[0].parentNode.nextSibling;
+					var next = document.getAnonymousNodes(this)[0]
+						.getElementsByAttribute('ztabindex', nextIndex);
+					if (next.length) {
+						next = next[0];
+						next.click();
 					}
 					else {
-						var visElem = next[0];
+						next = this.new();
+						next = next.firstChild.nextSibling;
 					}
-					this.ensureElementIsVisible(visElem);
 					
-					return true;
+					if (!next) {
+						Components.utils.reportError('Next row not found');
+						return;
+					}
+					
+					this.ensureElementIsVisible(next);
 				]]>
 				</body>
 			</method>
 			
 			
+			<method name="_onAddButtonKeypress">
+				<parameter name="event"/>
+				<body><![CDATA[
+					if (event.keyCode != event.DOM_VK_TAB || event.shiftKey) {
+						return true;
+					}
+					
+					this._lastTabIndex = 0;
+					this._tabDirection = 1;
+					this._focusField();
+					return false;
+				]]></body>
+			</method>
+			
+			
+			<!-- unused -->
+			<method name="getTagIndex">
+				<parameter name="id"/>
+				<body><![CDATA[
+					var rows = this.id('tagRows').getElementsByTagName('row');
+					for (let i=0; i<rows.length; i++) {
+						var row = rows[i].getAttribute('id');
+						if (row && row.split("-")[1] == id) {
+							return i;
+						}
+					}
+					return -1;
+				]]></body>
+			</method>
+			
+			
 			<method name="scrollToTop">
 				<body>
 				<![CDATA[
@@ -778,6 +982,8 @@
 			<method name="blurOpenField">
 				<body>
 				<![CDATA[
+					this._lastTabIndex = false;
+					
 					var textboxes = document.getAnonymousNodes(this)[0].getElementsByTagName('textbox');
 					if (textboxes && textboxes.length) {
 						textboxes[0].inputField.blur();
@@ -800,7 +1006,9 @@
 			<xul:scrollbox xbl:inherits="flex" orient="vertical" style="overflow:auto" class="zotero-box">
 				<xul:hbox align="center">
 					<xul:label id="tagsNum"/>
-					<xul:button id="addButton" label="&zotero.item.add;" oncommand="document.getBindingParent(this).new();" hidden="true"/>
+					<xul:button id="addButton" label="&zotero.item.add;"
+						onkeypress="return document.getBindingParent(this)._onAddButtonKeypress(event)"
+						oncommand="document.getBindingParent(this).new();"/>
 				</xul:hbox>
 				<xul:grid>
 					<xul:columns>
diff --git a/chrome/content/zotero/duplicatesMerge.js b/chrome/content/zotero/duplicatesMerge.js
index 00f4c410e7..435264db94 100644
--- a/chrome/content/zotero/duplicatesMerge.js
+++ b/chrome/content/zotero/duplicatesMerge.js
@@ -44,8 +44,7 @@ var Zotero_Duplicates_Pane = new function () {
 			}
 			
 			if (!item.isRegularItem() || [1,14].indexOf(item.itemTypeID) != -1) {
-				// TODO: localize
-				var msg = "Only top-level full items can be merged.";
+				var msg = Zotero.getString('pane.item.duplicates.onlyTopLevel');
 				ZoteroPane_Local.setItemPaneMessage(msg);
 				return false;
 			}
@@ -57,8 +56,7 @@ var Zotero_Duplicates_Pane = new function () {
 						var msg = Zotero.getString('pane.item.selected.multiple', items.length);
 					}
 					else {
-						// TODO: localize
-						var msg = "Merged items must all be of the same item type.";
+						var msg = Zotero.getString('pane.item.duplicates.onlySameItemType');
 					}
 					ZoteroPane_Local.setItemPaneMessage(msg);
 					return false;
@@ -112,7 +110,7 @@ var Zotero_Duplicates_Pane = new function () {
 			}, 0);
 		}
 		
-		button.label = "Merge " + (otherItems.length + 1) + " items";
+		button.label = Zotero.getString('pane.item.duplicates.mergeItems', (otherItems.length + 1));
 		itembox.hiddenFields = diff ? [] : ['dateAdded', 'dateModified'];
 		fieldSelect.hidden = !diff;
 		
diff --git a/chrome/content/zotero/errorReport.xul b/chrome/content/zotero/errorReport.xul
index ea4f6f0b48..868edb5b3f 100644
--- a/chrome/content/zotero/errorReport.xul
+++ b/chrome/content/zotero/errorReport.xul
@@ -5,9 +5,8 @@
 
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
-<!-- TODO: localize -->
 <wizard xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	id="zotero-error-report" title="Zotero Error Report">
+	id="zotero-error-report" title="&zotero.errorReport.title;">
 	
 	<script>
 	<![CDATA[
@@ -69,14 +68,14 @@
 				if (!xmlhttp.responseXML){
 					try {
 						if (xmlhttp.status>1000){
-							alert('No network connection');
+							alert(Zotero.getString('errorReport.noNetworkConnection'));
 						}
 						else {
-							alert('Invalid response from repository');
+							alert(Zotero.getString('errorReport.invalidResponseRepository'));
 						}
 					}
 					catch (e){
-						alert('Repository cannot be contacted');
+						alert(Zotero.getString('errorReport.repoCannotBeContacted'));
 					}
 					
 					wizard.rewind();
@@ -86,7 +85,7 @@
 				
 				var reported = xmlhttp.responseXML.getElementsByTagName('reported');
 				if (reported.length != 1) {
-					alert('Invalid response from repository');
+					alert(Zotero.getString('errorReport.invalidResponseRepository'));
 					wizard.rewind();
 					return;
 				}
diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js
index c0291fea82..107e805113 100644
--- a/chrome/content/zotero/fileInterface.js
+++ b/chrome/content/zotero/fileInterface.js
@@ -364,9 +364,6 @@ var Zotero_File_Interface = new function() {
 				translation.translate(libraryID);
 			}, 0);
 		} else {
-			// TODO: localize and remove fileInterface.fileFormatUnsupported string
-			var unsupportedFormat = "The selected file is not in a supported format.";
-			var viewSupportedFormats = "View Supported Formats...";
 			
 			var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
 									.getService(Components.interfaces.nsIPromptService);
@@ -375,10 +372,10 @@ var Zotero_File_Interface = new function() {
 			var index = ps.confirmEx(
 				null,
 				"",
-				unsupportedFormat,
+				Zotero.getString("fileInterface.unsupportedFormat"),
 				buttonFlags,
 				null,
-				viewSupportedFormats,
+				Zotero.getString("fileInterface.viewSupportedFormats"),
 				null, null, {}
 			);
 			if (index == 1) {
diff --git a/chrome/content/zotero/itemPane.js b/chrome/content/zotero/itemPane.js
index d61880e7f3..0e824b0f2b 100644
--- a/chrome/content/zotero/itemPane.js
+++ b/chrome/content/zotero/itemPane.js
@@ -49,7 +49,7 @@ var ZoteroItemPane = new function() {
 	
 	
 	/*
-	 * Load an item
+	 * Load a top-level item
 	 */
 	this.viewItem = function (item, mode, index) {
 		if (!index) {
diff --git a/chrome/content/zotero/locale/csl b/chrome/content/zotero/locale/csl
index 630f86f7b8..67de2bc8f2 160000
--- a/chrome/content/zotero/locale/csl
+++ b/chrome/content/zotero/locale/csl
@@ -1 +1 @@
-Subproject commit 630f86f7b88808b826bcd3c8e65d1fe6e62493ca
+Subproject commit 67de2bc8f2d22247463b1b84caf9bf0ab100f2fa
diff --git a/chrome/content/zotero/lookup.js b/chrome/content/zotero/lookup.js
index 1f4a3cbc0d..2ef6d9e6f3 100644
--- a/chrome/content/zotero/lookup.js
+++ b/chrome/content/zotero/lookup.js
@@ -31,71 +31,137 @@ const Zotero_Lookup = new function () {
 	/**
 	 * Performs a lookup by DOI, PMID, or ISBN
 	 */
-	this.accept = function() {
-		var identifierElement = document.getElementById("zotero-lookup-textbox");
-		var identifier = identifierElement.value;
-		
-		var doi = Zotero.Utilities.cleanDOI(identifier);
-		if(doi) {
-			var item = {itemType:"journalArticle", DOI:doi};
-		} else {
-			identifier = identifier.trim().replace(/[\- ]/g, "");
-			if(identifier.length == 10 || identifier.length == 13) {
-				// ISBN
-				var item = {itemType:"book", ISBN:identifier};
-			} else {
-				// PMID; right now, PMIDs are 8 digits, so there doesn't seem like we will need to
-				// discriminate for a fairly long time
-				var item = {itemType:"journalArticle", contextObject:"rft_id=info:pmid/"+identifier};
+	this.accept = function(textBox) {
+		var foundIDs = [];	//keep track of identifiers to avoid duplicates
+		var identifier = textBox.value;
+		//first look for DOIs
+		var ids = identifier.split(/[\s\u00A0]+/);	//whitespace + non-breaking space
+		var items = [], doi;
+		for(var i=0, n=ids.length; i<n; i++) {
+			if((doi = Zotero.Utilities.cleanDOI(ids[i])) && foundIDs.indexOf(doi) == -1) {
+				items.push({itemType:"journalArticle", DOI:doi});
+				foundIDs.push(doi);
 			}
 		}
-		
-		var translate = new Zotero.Translate("search");
-		translate.setSearch(item);
-		
-		// be lenient about translators
-		var translators = translate.getTranslators();
-		translate.setTranslator(translators);
-		
-		translate.setHandler("done", function(translate, success) {
-			identifierElement.style.opacity = 1;
-			identifierElement.disabled = false;
-			document.getElementById("zotero-lookup-progress").hidden = true;
-			if(success) {
-				document.getElementById("zotero-lookup-panel").hidePopup();
-			} else {
-				var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-				                        .getService(Components.interfaces.nsIPromptService);
-				prompts.alert(window, Zotero.getString("lookup.failure.title"),
-					Zotero.getString("lookup.failure.description"));
+
+		//then try ISBNs
+		if(!items.length) {
+			//first try replacing dashes
+			ids = identifier.replace(/[\u002D\u00AD\u2010-\u2015\u2212]+/g, "")	//hyphens and dashes
+											.toUpperCase();
+
+			var ISBN_RE = /(?:\D|^)(97[89]\d{10}|\d{9}[\dX])(?!\d)/g;
+			var isbn;
+
+			while(isbn = ISBN_RE.exec(ids)) {
+				isbn = Zotero.Utilities.cleanISBN(isbn[1]);
+				if(isbn && foundIDs.indexOf(isbn) == -1) {
+					items.push({itemType:"book", ISBN:isbn});
+					foundIDs.push(isbn);
+				}
 			}
-		});
-		
+
+			//now try spaces
+			if(!items.length) {
+				ids = ids.replace(/[ \u00A0]+/g, "");	//space + non-breaking space
+				while(isbn = ISBN_RE.exec(ids)) {
+					isbn = Zotero.Utilities.cleanISBN(isbn[1]);
+					if(isbn && foundIDs.indexOf(isbn) == -1) {
+						items.push({itemType:"book", ISBN:isbn});
+						foundIDs.push(isbn);
+					}
+				}
+			}
+		}
+
+		//finally try for PMID
+		if(!items.length) {
+			// PMID; right now, PMIDs are 8 digits, so it doesn't seem like we will need to
+			// discriminate for a fairly long time
+			var PMID_RE = /(?:\D|^)(\d{8})(?!\d)/g;
+			var pmid;
+			while((pmid = PMID_RE.exec(identifier)) && foundIDs.indexOf(pmid) == -1) {
+				items.push({itemType:"journalArticle", contextObject:"rft_id=info:pmid/"+pmid[1]});
+				foundIDs.push(pmid);
+			}
+		}
+
+		if(!items.length) {
+			var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+											.getService(Components.interfaces.nsIPromptService);
+			prompts.alert(window, Zotero.getString("lookup.failure.title"),
+				Zotero.getString("lookup.failureToID.description"));
+			return false;
+		}
+
 		var libraryID = null;
 		var collection = false;
 		try {
 			libraryID = ZoteroPane_Local.getSelectedLibraryID();
 			collection = ZoteroPane_Local.getSelectedCollection();
-		} catch(e) {}
-		translate.setHandler("itemDone", function(obj, item) {
-			if(collection) collection.addItem(item.id);
-		});
-		
-		identifierElement.style.opacity = 0.5;
-		identifierElement.disabled = true;
-		document.getElementById("zotero-lookup-progress").hidden = false;
-		
-		translate.translate(libraryID);
+		} catch(e) {
+			/** TODO: handle this **/
+		}
+
+		var notDone = items.length;	 //counter for asynchronous fetching
+		var successful = 0;					//counter for successful retrievals
+
+		Zotero_Lookup.toggleProgress(true);
+
+		var item;
+		while(item = items.pop()) {
+			(function(item) {
+				var translate = new Zotero.Translate.Search();
+				translate.setSearch(item);
+
+				// be lenient about translators
+				var translators = translate.getTranslators();
+				translate.setTranslator(translators);
+
+				translate.setHandler("done", function(translate, success) {
+					notDone--;
+					successful += success;
+
+					if(!notDone) {	//i.e. done
+						Zotero_Lookup.toggleProgress(false);
+						if(successful) {
+							document.getElementById("zotero-lookup-panel").hidePopup();
+						} else {
+							var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+																			.getService(Components.interfaces.nsIPromptService);
+							prompts.alert(window, Zotero.getString("lookup.failure.title"),
+								Zotero.getString("lookup.failure.description"));
+						}
+					}
+				});
+
+				translate.setHandler("itemDone", function(obj, item) {
+					if(collection) collection.addItem(item.id);
+				});
+				
+				translate.translate(libraryID);
+			})(item);
+		}
+
 		return false;
 	}
 	
 	/**
 	 * Handles a key press
 	 */
-	this.onKeyPress = function(event) {
+	this.onKeyPress = function(event, textBox) {
 		var keyCode = event.keyCode;
+		//use enter to start search, shift+enter to insert a new line. Flipped in multiline mode
+		var multiline = textBox.getAttribute('multiline');
+		var search = multiline ? event.shiftKey : !event.shiftKey;
 		if(keyCode === 13 || keyCode === 14) {
-			Zotero_Lookup.accept();
+			if(search) {
+				Zotero_Lookup.accept(textBox);
+				event.stopImmediatePropagation();
+			} else if(!multiline) {	//switch to multiline
+				var mlTextbox = Zotero_Lookup.toggleMultiline(true);
+				mlTextbox.value = mlTextbox.value + '\n';
+			}
 		} else if(keyCode == event.DOM_VK_ESCAPE) {
 			document.getElementById("zotero-lookup-panel").hidePopup();
 		}
@@ -107,20 +173,74 @@ const Zotero_Lookup = new function () {
 	 */
 	this.onShowing = function() {
 		document.getElementById("zotero-lookup-panel").style.padding = "10px";
-		
-		document.getElementById("zotero-lookup-progress").hidden = false;
-		var identifierElement = document.getElementById("zotero-lookup-textbox");
-		identifierElement.style.opacity = 1;
-		identifierElement.disabled = false;
+
+		var identifierElement = Zotero_Lookup.toggleMultiline(false);
+		Zotero_Lookup.toggleProgress(false);
 		identifierElement.focus();
 	}
 	
 	/**
 	 * Cancels the popup and resets fields
 	 */
-	this.onHidden = function(event) {
-		if (event.target.id == 'zotero-lookup-panel') {
-			document.getElementById("zotero-lookup-textbox").value = "";
+	this.onHidden = function() {
+		var txtBox = Zotero_Lookup.toggleMultiline(false);
+		var mlTextbox = document.getElementById("zotero-lookup-multiline-textbox");
+		txtBox.value = "";
+		mlTextbox.value = "";
+	}
+
+	/**
+	 * Converts the textbox to multiline if newlines are detected
+	 */
+	this.adjustTextbox = function(txtBox) {
+		if(txtBox.value.trim().match(/[\r\n]/)) {
+			Zotero_Lookup.toggleMultiline(true);
+		} else {
+			//since we ignore trailing and leading newlines, we should also trim them for display
+			//can't use trim, because then we cannot add leading/trailing spaces to the single line textbox
+			txtBox.value = txtBox.value.replace(/^([ \t]*[\r\n]+[ \t]*)+|([ \t]*[\r\n]+[ \t]*)+$/g,"");
 		}
 	}
+
+	/**
+	 * Performs the switch to multiline textbox and returns that textbox
+	 */
+	this.toggleMultiline = function(on) {
+		var mlPanel = document.getElementById("zotero-lookup-multiline");
+		var mlTxtBox = document.getElementById("zotero-lookup-multiline-textbox");
+		var slPanel = document.getElementById("zotero-lookup-singleLine");
+		var slTxtBox = document.getElementById("zotero-lookup-textbox");
+		var source = on ? slTxtBox : mlTxtBox;
+		var dest = on ? mlTxtBox : slTxtBox;
+
+		if((mlPanel.collapsed && !on) || (!mlPanel.collapsed && on)) return dest;
+
+		//copy over the value
+		dest.value = source.value;
+
+		//switch textboxes
+		mlPanel.setAttribute("collapsed", !on);
+		slPanel.setAttribute("collapsed", !!on);
+		dest.focus();
+		return dest;
+	}
+
+	this.toggleProgress = function(on) {
+		//single line
+		var txtBox = document.getElementById("zotero-lookup-textbox");
+		txtBox.style.opacity = on ? 0.5 : 1;
+		txtBox.disabled = !!on;
+		document.getElementById("zotero-lookup-progress").setAttribute("collapsed", !on);
+
+		//multiline
+		document.getElementById("zotero-lookup-multiline-textbox").disabled = !!on;
+		document.getElementById("zotero-lookup-multiline-progress").setAttribute("collapsed", !on);
+	}
+
+	this.getActivePanel = function() {
+		var mlPanel = document.getElementById("zotero-lookup-multiline");
+		if(mlPanel.collapsed) return document.getElementById("zotero-lookup-singleLine");
+
+		return mlPanel;
+	}
 }
diff --git a/chrome/content/zotero/merge.js b/chrome/content/zotero/merge.js
index 86f3d2b01a..1939454a89 100644
--- a/chrome/content/zotero/merge.js
+++ b/chrome/content/zotero/merge.js
@@ -266,15 +266,15 @@ var Zotero_Merge_Window = new function () {
 	function _setInstructionsString(buttonName) {
 		switch (_mergeGroup.type) {
 			case 'storagefile':
-				var msg = "The following file has been changed in multiple locations.";
+				var msg = Zotero.getString('sync.conflict.fileChanged');
 				break;
 			
 			default:
-				// TODO: localize and maybe not always call it 'item'
-				var msg = "The following item has been changed in multiple locations.";
+				// TODO: cf. localization: maybe not always call it 'item'
+				var msg = Zotero.getString('sync.conflict.itemChanged');
 		}
 		
-		msg += " Choose the version you would like to keep, and then click " + buttonName + ".";
+		msg += " " + Zotero.getString('sync.conflict.chooseVersionToKeep', buttonName);
 		
 		document.getElementById('zotero-merge-instructions').value = msg;
 	}
diff --git a/chrome/content/zotero/merge.xul b/chrome/content/zotero/merge.xul
index 8af554908e..608f33fbad 100644
--- a/chrome/content/zotero/merge.xul
+++ b/chrome/content/zotero/merge.xul
@@ -28,7 +28,7 @@
 <?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
 <?xml-stylesheet href="chrome://zotero/skin/merge.css" type="text/css"?>
 
-<!-- <!DOCTYPE window SYSTEM "chrome://zotero/locale/merge.dtd"> -->
+<!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
 <wizard
 	id="zotero-merge-window"
@@ -44,13 +44,13 @@
 	<wizardpage onpageshow="Zotero_Merge_Window.init()"
 			onpagerewound="Zotero_Merge_Window.onBack(); return false"
 			onpageadvanced="return Zotero_Merge_Window.onNext()"
-			label="Conflict Resolution">
+			label="&zotero.merge.title;">
 		<description id="zotero-merge-instructions"/>
 		<zoteromergegroup flex="1"/>
 		<separator class="thin"/>
 		<hbox id="zotero-step-count">
 			<label id="zotero-merge-num-objects"/>
-			<label value="of"/>
+			<label value="&zotero.merge.of;"/>
 			<label id="zotero-merge-total-objects"/>
 		</hbox>
 	</wizardpage>
diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js
index 56968d3ef6..85b6ac4f0b 100644
--- a/chrome/content/zotero/preferences/preferences.js
+++ b/chrome/content/zotero/preferences/preferences.js
@@ -283,16 +283,11 @@ function updateStorageSettings(enabled, protocol, skipWarnings) {
 			var account = Zotero.Sync.Server.username;
 			var index = ps.confirmEx(
 				null,
-				// TODO: localize
-				"Purge Attachment Files on Zotero Servers?",
-				
-				"If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library "
-					+ "to the Zotero servers, you can purge those files from the Zotero servers to give you more "
-					+ "storage space for groups.\n\n"
-					+ "You can purge files at any time from your account settings on zotero.org.",
+				Zotero.getString('zotero.preferences.sync.purgeStorage.title'),
+				Zotero.getString('zotero.preferences.sync.purgeStorage.desc'),
 				buttonFlags,
-				"Purge Files Now",
-				"Do Not Purge", null, null, {}
+				Zotero.getString('zotero.preferences.sync.purgeStorage.confirmButton'),
+				Zotero.getString('zotero.preferences.sync.purgeStorage.cancelButton'), null, null, {}
 			);
 			
 			if (index == 0) {
@@ -478,11 +473,9 @@ function handleSyncReset(action) {
 		ps.alert(
 			null,
 			Zotero.getString('general.error'),
-			// TODO: localize
-			"You must enter a username and password in the "
-				+ document.getElementById('zotero-prefpane-sync')
-					.getElementsByTagName('tab')[0].label
-				+ " tab before using the reset options."
+			Zotero.getString('zotero.preferences.sync.reset.userInfoMissing',
+							document.getElementById('zotero-prefpane-sync')
+							.getElementsByTagName('tab')[0].label)
 		);
 		return;
 	}
@@ -496,12 +489,10 @@ function handleSyncReset(action) {
 								+ ps.BUTTON_POS_1_DEFAULT;
 			var index = ps.confirmEx(
 				null,
-				// TODO: localize
 				Zotero.getString('general.warning'),
-				"All data in this copy of Zotero will be erased and replaced with "
-					+ "data belonging to user '" + account + "' on the Zotero server.",
+				Zotero.getString('zotero.preferences.sync.reset.restoreFromServer', account),
 				buttonFlags,
-				"Replace Local Data",
+				Zotero.getString('zotero.preferences.sync.reset.replaceLocalData'),
 				null, null, null, {}
 			);
 			
@@ -524,8 +515,7 @@ function handleSyncReset(action) {
 						var index = ps.confirmEx(
 							null,
 							Zotero.getString('general.restartRequired'),
-							// TODO: localize
-							"Firefox must be restarted to complete the restore process.",
+							Zotero.getString('zotero.preferences.sync.reset.restartToComplete'),
 							buttonFlags,
 							Zotero.getString('general.restartNow'),
 							null, null, null, {}
@@ -557,14 +547,10 @@ function handleSyncReset(action) {
 							+ ps.BUTTON_POS_1_DEFAULT;
 			var index = ps.confirmEx(
 				null,
-				// TODO: localize
 				Zotero.getString('general.warning'),
-				"All data belonging to user '" + account + "' on the Zotero server "
-					+ "will be erased and replaced with data from this copy of Zotero.\n\n"
-					+ "Depending on the size of your library, there may be a delay before "
-					+ "your data is available on the server.",
+				Zotero.getString('zotero.preferences.sync.reset.restoreToServer', account),
 				buttonFlags,
-				"Replace Server Data",
+				Zotero.getString('zotero.preferences.sync.reset.replaceServerData'),
 				null, null, null, {}
 			);
 			
@@ -615,12 +601,10 @@ function handleSyncReset(action) {
 							+ ps.BUTTON_POS_1_DEFAULT;
 			var index = ps.confirmEx(
 				null,
-				// TODO: localize
 				Zotero.getString('general.warning'),
-				"All file sync history will be cleared.\n\n"
-					+ "Any local attachment files that do not exist on the storage server will be uploaded on the next sync.",
+				Zotero.getString('zotero.preferences.sync.reset.fileSyncHistory'),
 				buttonFlags,
-				"Reset",
+				Zotero.getString('general.reset'),
 				null, null, null, {}
 			);
 			
@@ -1509,7 +1493,6 @@ Zotero_Preferences.Debug_Output = {
 	},
 	
 	
-	// TODO: localize
 	submit: function () {
 		document.getElementById('debug-output-submit').disabled = true;
 		document.getElementById('debug-output-submit-progress').hidden = false;
@@ -1534,7 +1517,7 @@ Zotero_Preferences.Debug_Output = {
 				ps.alert(
 					null,
 					Zotero.getString('general.error'),
-					'Invalid response from server'
+					Zotero.getString('general.invalidResponseServer')
 				);
 				return;
 			}
@@ -1543,7 +1526,7 @@ Zotero_Preferences.Debug_Output = {
 				ps.alert(
 					null,
 					Zotero.getString('general.error'),
-					'The server returned an error. Please try again.'
+					Zotero.getString('general.serverError')
 				);
 				return;
 			}
@@ -1551,9 +1534,8 @@ Zotero_Preferences.Debug_Output = {
 			var reportID = reported[0].getAttribute('reportID');
 			ps.alert(
 				null,
-				"Debug Output Submitted",
-				"Debug output has been sent to the Zotero server.\n\n"
-					+ "The Debug ID is D" + reportID + "."
+				Zotero.getString('zotero.preferences.advanced.debug.title'),
+				Zotero.getString('zotero.preferences.advanced.debug.sent', reportID)
 			);
 		}
 		
@@ -1571,10 +1553,8 @@ Zotero_Preferences.Debug_Output = {
 			if (Zotero.HTTP.browserIsOffline()) {
 				ps.alert(
 					null,
-					Zotero.getString(
-						'general.error',
-						Zotero.appName + " is in offline mode."
-					)
+					Zotero.getString('general.error'),
+					Zotero.getString('general.browserIsOffline', Zotero.appName)
 				);
 				return false;
 			}
@@ -1626,7 +1606,7 @@ Zotero_Preferences.Debug_Output = {
 				ps.alert(
 					null,
 					Zotero.getString('general.error'),
-					"An error occurred sending debug output."
+					Zotero.getString('zotero.preferences.advanced.debug.error')
 				);
 			}
 		}
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index 547e2e0577..7fd1ce4daa 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -343,11 +343,8 @@ To add a new preference:
 				</tabpanel>
 				
 				<tabpanel id="zotero-reset" orient="vertical">
-					<!-- TODO: localize -->
 					<!-- This doesn't wrap without an explicit width, for some reason -->
-					<description width="45em">The following operations are for use only in rare, specific situations and should not be used for general troubleshooting.
-					In many cases, resetting will cause additional problems.
-					See <label style="margin-left: 0; margin-right: 0" class="zotero-text-link" href="http://zotero.org/support/kb/sync_reset_options">Sync Reset Options</label> for more information.</description>
+					<description width="45em">&zotero.preferences.sync.reset.warning1;<label style="margin-left: 0; margin-right: 0" class="zotero-text-link" href="http://zotero.org/support/kb/sync_reset_options">&zotero.preferences.sync.reset.warning2;</label>&zotero.preferences.sync.reset.warning3;</description>
 					
 					<radiogroup id="zotero-reset-sync-group" oncommand="handleSyncResetSelect(this)">
 						<groupbox>
@@ -731,9 +728,8 @@ To add a new preference:
 		
 		<tabbox id="zotero-prefpane-advanced-tabs">
 			<tabs>
-				<!-- TODO: localize -->
-				<tab label="General"/>
-				<tab label="Files and Folders"/>
+				<tab label="&zotero.preferences.prefpane.general;"/>
+				<tab label="&zotero.preferences.advanced.filesAndFolders;"/>
 			</tabs>
 			
 			<tabpanels id="zotero-prefpane-advanced-tabpanels">
diff --git a/chrome/content/zotero/tagColorChooser.xul b/chrome/content/zotero/tagColorChooser.xul
index efe8f3bec8..745e504657 100644
--- a/chrome/content/zotero/tagColorChooser.xul
+++ b/chrome/content/zotero/tagColorChooser.xul
@@ -37,7 +37,7 @@
 	ondialogcancel="Zotero_Tag_Color_Chooser.onDialogCancel()"
 	ondialogextra1="Zotero_Tag_Color_Chooser.onDialogRemoveColor()"
 	onload="Zotero_Tag_Color_Chooser.init()"
-	width="300"
+	width="350"
 	height="140">
 	
 	<script src="include.js"/>
diff --git a/chrome/content/zotero/tinymce/note.html b/chrome/content/zotero/tinymce/note.html
index 7a97f1c89d..1931359d70 100644
--- a/chrome/content/zotero/tinymce/note.html
+++ b/chrome/content/zotero/tinymce/note.html
@@ -25,6 +25,15 @@
 		},
 		
 		setup : function (ed) {
+			// Set text direction
+			var dir = window.location.href.match(/dir=(ltr|rtl)/)[1];
+			ed.settings.directionality = dir;
+			// Include button for opposite direction, to function as a toggle
+			ed.settings.theme_advanced_buttons1 = ed.settings.theme_advanced_buttons1.replace(
+				"%DIR%",
+				"," + dir.split("").reverse().join("")
+			);
+			
 			ed.onInit.add(function (ed) {
 				zoteroInit(ed);
 			});
@@ -40,10 +49,10 @@
 		
 		fix_list_elements : true,
 		fix_table_elements : true,
-		plugins : "paste,contextmenu",
+		plugins : "paste,contextmenu,directionality",
 		
 		// Theme options
-		theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,sub,sup,|,forecolor,backcolor,|,blockquote,|,link,unlink",
+		theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,sub,sup,|,forecolor,backcolor,|,blockquote,|,link,unlink,|,%DIR%",
 		theme_advanced_buttons2 : "formatselect,|,justifyleft,justifycenter,justifyright,|,bullist,numlist,outdent,indent,|,removeformat,code",
 		theme_advanced_buttons3 : "",
 		theme_advanced_toolbar_location : "top",
diff --git a/chrome/content/zotero/tinymce/plugins/directionality/editor_plugin.js b/chrome/content/zotero/tinymce/plugins/directionality/editor_plugin.js
new file mode 100644
index 0000000000..90847e78e3
--- /dev/null
+++ b/chrome/content/zotero/tinymce/plugins/directionality/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Directionality",{init:function(b,c){var d=this;d.editor=b;function a(e){var h=b.dom,g,f=b.selection.getSelectedBlocks();if(f.length){g=h.getAttrib(f[0],"dir");tinymce.each(f,function(i){if(!h.getParent(i.parentNode,"*[dir='"+e+"']",h.getRoot())){if(g!=e){h.setAttrib(i,"dir",e)}else{h.setAttrib(i,"dir",null)}}});b.nodeChanged()}}b.addCommand("mceDirectionLTR",function(){a("ltr")});b.addCommand("mceDirectionRTL",function(){a("rtl")});b.addButton("ltr",{title:"directionality.ltr_desc",cmd:"mceDirectionLTR"});b.addButton("rtl",{title:"directionality.rtl_desc",cmd:"mceDirectionRTL"});b.onNodeChange.add(d._nodeChange,d)},getInfo:function(){return{longname:"Directionality",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var d=b.dom,c;e=d.getParent(e,d.isBlock);if(!e){a.setDisabled("ltr",1);a.setDisabled("rtl",1);return}c=d.getAttrib(e,"dir");a.setActive("ltr",c=="ltr");a.setDisabled("ltr",0);a.setActive("rtl",c=="rtl");a.setDisabled("rtl",0)}});tinymce.PluginManager.add("directionality",tinymce.plugins.Directionality)})();
\ No newline at end of file
diff --git a/chrome/content/zotero/upgrade.xul b/chrome/content/zotero/upgrade.xul
index 615512d0b9..fe44b4a35f 100644
--- a/chrome/content/zotero/upgrade.xul
+++ b/chrome/content/zotero/upgrade.xul
@@ -5,8 +5,7 @@
 
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
-<!-- TODO: localize -->
-<wizard id="zotero-schema-upgrade" title="Zotero Upgrade Wizard"
+<wizard id="zotero-schema-upgrade" title="&zotero.upgrade.title;"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	
 	<script>
diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
index b451f8c68a..39eb307da6 100644
--- a/chrome/content/zotero/xpcom/cite.js
+++ b/chrome/content/zotero/xpcom/cite.js
@@ -434,6 +434,15 @@ Zotero.Cite.System = {
 				}
 			}
 		}
+
+		// extract PMID
+		var extra = zoteroItem.getField("extra", false, true);
+		if(typeof extra === "string") {
+			var m = /(?:^|\n)PMID:\s*([0-9]+)/.exec(extra);
+			if(m) cslItem.PMID = m[1];
+			m = /(?:^|\n)PMCID:\s*([0-9]+)/.exec(extra);
+			if(m) cslItem.PMCID = m[1];
+		}
 		
 		//this._cache[zoteroItem.id] = cslItem;
 		return cslItem;
diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
index cbf10fbd3f..0989ae3665 100644
--- a/chrome/content/zotero/xpcom/collectionTreeView.js
+++ b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -161,7 +161,7 @@ Zotero.CollectionTreeView.prototype.refresh = function()
 		this._showRow(new Zotero.ItemGroup('separator', false));
 		var header = {
 			id: "group-libraries-header",
-			label: "Group Libraries", // TODO: localize
+			label: Zotero.getString('pane.collections.groupLibraries'),
 			expand: function (beforeRow, groups) {
 				if (!groups) {
 					var groups = Zotero.Groups.getAll();
@@ -432,7 +432,7 @@ Zotero.CollectionTreeView.prototype.getImageSrc = function(row, col)
 					var errors = Zotero.Sync.Runner.getErrors(libraryID);
 					if (errors) {
 						var e = Zotero.Sync.Runner.getPrimaryError(errors);
-						switch (e.status) {
+						switch (e.errorMode) {
 						case 'warning':
 							var image = 'error';
 							break;
diff --git a/chrome/content/zotero/xpcom/cookieSandbox.js b/chrome/content/zotero/xpcom/cookieSandbox.js
index 6d9d4ddb54..da3b9a7c2e 100755
--- a/chrome/content/zotero/xpcom/cookieSandbox.js
+++ b/chrome/content/zotero/xpcom/cookieSandbox.js
@@ -142,7 +142,7 @@ Zotero.CookieSandbox.Observer = new function() {
 	this.observe = function(channel, topic) {
 		channel.QueryInterface(Components.interfaces.nsIHttpChannel);
 		var trackedBy, tested, browser, callbacks,
-			channelURI = channel.URI.spec,
+			channelURI = channel.URI.hostPort,
 			notificationCallbacks = channel.notificationCallbacks;
 		
 		// try the notification callbacks
diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index 72078fdd96..7f9f828f3b 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -3753,19 +3753,16 @@ Zotero.Item.prototype.addTag = function(name, type) {
 Zotero.Item.prototype.addTags = function (tags, type) {
 	Zotero.DB.beginTransaction();
 	try {
-		var tagIDArray = [];
-		var tempID = false;
+		var tagIDs = [];
 		for (var i = 0; i < tags.length; i++) {
-			tempID = this.addTag(tags[i], type);
-			if (tempID) {
-				tagIDArray.push(tempID);
+			let id = this.addTag(tags[i], type);
+			if (id) {
+				tagIDs.push(id);
 			}
 		}
 		
-		tagIDArray = (tagIDArray.length>0) ? tagIDArray : false;
-		
 		Zotero.DB.commitTransaction();
-		return tagIDArray;
+		return tagIDs.length > 0 ? tagIDs : false;
 	}
 	catch (e) {
 		Zotero.DB.rollbackTransaction();
@@ -3847,21 +3844,6 @@ Zotero.Item.prototype.getTagIDs = function() {
 	return Zotero.DB.columnQuery(sql, this.id);
 }
 
-/**
-* Return the index of tagID in the list of the item's tags sorted in alphabetical order.
-*/
-Zotero.Item.prototype.getTagIndex = function(tagID) {
-	var tags = this.getTags();
-	
-	for (var i=0;i<tags.length;i++) {
-		if (tagID == tags[i].id) {
-			return i;
-		}
-	}
-	
-	return false;
-}
-
 Zotero.Item.prototype.replaceTag = function(oldTagID, newTag) {
 	if (!this.id) {
 		throw ('Cannot replace tag on unsaved item');
diff --git a/chrome/content/zotero/xpcom/data/tags.js b/chrome/content/zotero/xpcom/data/tags.js
index 4c68364736..b0f1ed032b 100644
--- a/chrome/content/zotero/xpcom/data/tags.js
+++ b/chrome/content/zotero/xpcom/data/tags.js
@@ -603,7 +603,7 @@ Zotero.Tags = new function() {
 				}
 				
 				let id = libraryID + "/" + setting;
-				if (event == 'modify' && extraData[id].changed) {
+				if ((event == 'modify' || event == 'delete') && extraData[id].changed) {
 					var previousTagColors = extraData[id].changed.value;
 				}
 				else {
@@ -744,9 +744,8 @@ Zotero.Tags = new function() {
 				.getService(Components.interfaces["nsIChromeRegistry"])
 				.convertChromeURL(uri);
 			
-			let file = uri.QueryInterface(Components.interfaces.nsIFileURL).file;
 			var img = new win.Image();
-			img.src = Zotero.File.generateDataURI(file, "image/png");
+			img.src = uri.spec;
 			
 			// Mark that we've started loading
 			var deferred = Q.defer();
diff --git a/chrome/content/zotero/xpcom/date.js b/chrome/content/zotero/xpcom/date.js
index 2d407cd8a0..ea21fe6285 100644
--- a/chrome/content/zotero/xpcom/date.js
+++ b/chrome/content/zotero/xpcom/date.js
@@ -228,29 +228,31 @@ Zotero.Date = new function(){
 	var _dayRe = null;
 	
 	function strToDate(string) {
-		// Parse 'yesterday'/'today'/'tomorrow'
-		var lc = (string + '').toLowerCase();
-		if (lc == 'yesterday' || (Zotero.getString && lc === Zotero.getString('date.yesterday'))) {
-			string = Zotero.Date.dateToSQL(new Date(new Date().getTime() - 86400000)).substr(0, 10);
-		}
-		else if (lc == 'today' || (Zotero.getString && lc == Zotero.getString('date.today'))) {
-			string = Zotero.Date.dateToSQL(new Date()).substr(0, 10);
-		}
-		else if (lc == 'tomorrow' || (Zotero.getString && lc == Zotero.getString('date.tomorrow'))) {
-			string = Zotero.Date.dateToSQL(new Date(new Date().getTime() + 86400000)).substr(0, 10);
-		}
-		
 		var date = {
 			order: ''
 		};
-		var parts = [];
 		
 		// skip empty things
 		if(!string) {
 			return date;
 		}
 		
-		string = string.toString().replace(/^\s+/, "").replace(/\s+$/, "").replace(/\s+/, " ");
+		var parts = [];
+		
+		// Parse 'yesterday'/'today'/'tomorrow'
+		var lc = (string + '').toLowerCase();
+		if (lc == 'yesterday' || (Zotero.getString && lc === Zotero.getString('date.yesterday'))) {
+			string = Zotero.Date.dateToSQL(new Date(Date.now() - 1000*60*60*24)).substr(0, 10);
+		}
+		else if (lc == 'today' || (Zotero.getString && lc == Zotero.getString('date.today'))) {
+			string = Zotero.Date.dateToSQL(new Date()).substr(0, 10);
+		}
+		else if (lc == 'tomorrow' || (Zotero.getString && lc == Zotero.getString('date.tomorrow'))) {
+			string = Zotero.Date.dateToSQL(new Date(Date.now() + 1000*60*60*24)).substr(0, 10);
+		}
+		else {
+			string = string.toString().replace(/^\s+|\s+$/g, "").replace(/\s+/, " ");
+		}
 		
 		// first, directly inspect the string
 		var m = _slashRe.exec(string);
@@ -442,13 +444,16 @@ Zotero.Date = new function(){
 		
 		// clean up date part
 		if(date.part) {
-			date.part = date.part.replace(/^[^A-Za-z0-9]+/, "").replace(/[^A-Za-z0-9]+$/, "");
+			date.part = date.part.replace(/^[^A-Za-z0-9]+|[^A-Za-z0-9]+$/g, "");
 		}
 		
 		if(date.part === "" || date.part == undefined) {
 			delete date.part;
 		}
 		
+		//make sure year is always a string
+		if(date.year || date.year === 0) date.year += '';
+		
 		return date;
 	}
 	
@@ -787,4 +792,4 @@ Zotero.Date = new function(){
 		}
 		return _localeDateOrder;
 	}
-}
\ No newline at end of file
+}
diff --git a/chrome/content/zotero/xpcom/duplicates.js b/chrome/content/zotero/xpcom/duplicates.js
index 4cf91b7bad..e3350cac50 100644
--- a/chrome/content/zotero/xpcom/duplicates.js
+++ b/chrome/content/zotero/xpcom/duplicates.js
@@ -124,6 +124,18 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 		return str;
 	}
 	
+	function sortByValue(a, b) {
+		if((a.value === null && b.value !== null)
+			|| (a.value === undefined && b.value !== undefined)
+			|| a.value < b.value) {
+			return -1;
+		}
+		
+		if(a.value === b.value) return 0;
+		
+		return 1;
+	}
+	
 	/**
 	 * @param {Function} compareRows  Comparison function, if not exact match
 	 * @param {Boolean} reprocessMatches  Compare every row against every other,
@@ -181,8 +193,7 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 	var sql = "SELECT itemID, value FROM items JOIN itemData USING (itemID) "
 				+ "JOIN itemDataValues USING (valueID) "
 				+ "WHERE libraryID=? AND itemTypeID=? AND fieldID=? "
-				+ "AND itemID NOT IN (SELECT itemID FROM deletedItems) "
-				+ "ORDER BY value";
+				+ "AND itemID NOT IN (SELECT itemID FROM deletedItems)";
 	var rows = Zotero.DB.query(
 		sql,
 		[
@@ -194,25 +205,28 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 	var isbnCache = {};
 	if (rows) {
 		for each(var row in rows) {
-			isbnCache[row.itemID] = (row.value+'').replace(/[^\dX]+/ig, '').toUpperCase(); //ignore formatting
+			row.value = (row.value+'').replace(/[^\dX]+/ig, '').toUpperCase(); //ignore formatting
+			isbnCache[row.itemID] = row.value;
 		}
+		rows.sort(sortByValue);
+		processRows();
 	}
-	processRows();
 	
 	// DOI
 	var sql = "SELECT itemID, value FROM items JOIN itemData USING (itemID) "
 				+ "JOIN itemDataValues USING (valueID) "
-				+ "WHERE libraryID=? AND fieldID=? AND REGEXP('^10\.', value) "
-				+ "AND itemID NOT IN (SELECT itemID FROM deletedItems) "
-				+ "ORDER BY value";
+				+ "WHERE libraryID=? AND fieldID=? AND REGEXP('^10\\.', value) "
+				+ "AND itemID NOT IN (SELECT itemID FROM deletedItems)";
 	var rows = Zotero.DB.query(sql, [this._libraryID, Zotero.ItemFields.getID('DOI')]);
 	var doiCache = {};
 	if (rows) {
 		for each(var row in rows) {
-			doiCache[row.itemID] = row.value.trim();
+			row.value = (row.value+'').trim().toUpperCase(); //DOIs are case insensitive
+			doiCache[row.itemID] = row.value;
 		}
+		rows.sort(sortByValue);
+		processRows();
 	}
-	processRows();
 	
 	// Get years
 	var dateFields = [Zotero.ItemFields.getID('date')].concat(
@@ -243,103 +257,102 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 				+ "AND itemTypeID NOT IN (1, 14) "
 				+ "AND itemID NOT IN (SELECT itemID FROM deletedItems)";
 	var rows = Zotero.DB.query(sql, [this._libraryID]);
-	//normalize all values ahead of time
-	rows = rows.map(function(row) {
-							row.value = normalizeString(row.value);
-							return row;
-						});
-	//sort rows by normalized values
-	rows = rows.sort(function(a, b) {
-							if(a.value === b.value) return 0;
-							if(a.value < b.value) return -1;
-							return 1;
-						});
-	processRows(function (a, b) {
-		var aTitle = a.value;
-		var bTitle = b.value;
+	if(rows) {
+		//normalize all values ahead of time
+		rows = rows.map(function(row) {
+			row.value = normalizeString(row.value);
+			return row;
+		});
+		//sort rows by normalized values
+		rows.sort(sortByValue);
 		
-		// If we stripped one of the strings completely, we can't compare them
-		if (aTitle.length == 0 || bTitle.length == 0) {
-			return -1;
-		}
-		
-		if (aTitle !== bTitle) {
-			return -1;	//everything is sorted by title, so if this mismatches, everything following will too
-		}
-		
-		// If both items have a DOI and they don't match, it's not a dupe
-		if (typeof doiCache[a.itemID] != 'undefined'
-				&& typeof doiCache[b.itemID] != 'undefined'
-				&& doiCache[a.itemID] != doiCache[b.itemID]) {
-			return 0;
-		}
-		
-		// If both items have an ISBN and they don't match, it's not a dupe
-		if (typeof isbnCache[a.itemID] != 'undefined'
-				&& typeof isbnCache[b.itemID] != 'undefined'
-				&& isbnCache[a.itemID] != isbnCache[b.itemID]) {
-			return 0;
-		}
-		
-		// If both items have a year and they're off by more than one, it's not a dupe
-		if (typeof yearCache[a.itemID] != 'undefined'
-				&& typeof yearCache[b.itemID] != 'undefined'
-				&& Math.abs(yearCache[a.itemID] - yearCache[b.itemID]) > 1) {
-			return 0;
-		}
-		
-		// Check for at least one match on last name + first initial of first name
-		var aCreatorRows, bCreatorRows;
-		if (typeof creatorRowsCache[a.itemID] != 'undefined') {
-			aCreatorRows = creatorRowsCache[a.itemID];
-		}
-		else {
-			var sql = "SELECT lastName, firstName, fieldMode FROM itemCreators "
-						+ "JOIN creators USING (creatorID) "
-						+ "JOIN creatorData USING (creatorDataID) "
-						+ "WHERE itemID=? ORDER BY orderIndex LIMIT 10";
-			aCreatorRows = Zotero.DB.query(sql, a.itemID);
-			creatorRowsCache[a.itemID] = aCreatorRows;
-		}
-		
-		// Check for at least one match on last name + first initial of first name
-		if (typeof creatorRowsCache[b.itemID] != 'undefined') {
-			bCreatorRows = creatorRowsCache[b.itemID];
-		}
-		else {
-			var sql = "SELECT lastName, firstName, fieldMode FROM itemCreators "
-						+ "JOIN creators USING (creatorID) "
-						+ "JOIN creatorData USING (creatorDataID) "
-						+ "WHERE itemID=? ORDER BY orderIndex LIMIT 10";
-			bCreatorRows = Zotero.DB.query(sql, b.itemID);
-			creatorRowsCache[b.itemID] = bCreatorRows;
-		}
-		
-		// Match if no creators
-		if (!aCreatorRows && !bCreatorRows) {
-			return 1;
-		}
-		
-		if (!aCreatorRows || !bCreatorRows) {
-			return 0;
-		}
-		
-		for each(var aCreatorRow in aCreatorRows) {
-			var aLastName = normalizeString(aCreatorRow.lastName);
-			var aFirstInitial = aCreatorRow.fieldMode == 0 ? normalizeString(aCreatorRow.firstName).charAt(0) : false;
+		processRows(function (a, b) {
+			var aTitle = a.value;
+			var bTitle = b.value;
 			
-			for each(var bCreatorRow in bCreatorRows) {
-				var bLastName = normalizeString(bCreatorRow.lastName);
-				var bFirstInitial = bCreatorRow.fieldMode == 0 ? normalizeString(bCreatorRow.firstName).charAt(0) : false;
+			// If we stripped one of the strings completely, we can't compare them
+			if(!aTitle || !bTitle) {
+				return -1;
+			}
+			
+			if (aTitle !== bTitle) {
+				return -1;	//everything is sorted by title, so if this mismatches, everything following will too
+			}
+			
+			// If both items have a DOI and they don't match, it's not a dupe
+			if (typeof doiCache[a.itemID] != 'undefined'
+					&& typeof doiCache[b.itemID] != 'undefined'
+					&& doiCache[a.itemID] != doiCache[b.itemID]) {
+				return 0;
+			}
+			
+			// If both items have an ISBN and they don't match, it's not a dupe
+			if (typeof isbnCache[a.itemID] != 'undefined'
+					&& typeof isbnCache[b.itemID] != 'undefined'
+					&& isbnCache[a.itemID] != isbnCache[b.itemID]) {
+				return 0;
+			}
+			
+			// If both items have a year and they're off by more than one, it's not a dupe
+			if (typeof yearCache[a.itemID] != 'undefined'
+					&& typeof yearCache[b.itemID] != 'undefined'
+					&& Math.abs(yearCache[a.itemID] - yearCache[b.itemID]) > 1) {
+				return 0;
+			}
+			
+			// Check for at least one match on last name + first initial of first name
+			var aCreatorRows, bCreatorRows;
+			if (typeof creatorRowsCache[a.itemID] != 'undefined') {
+				aCreatorRows = creatorRowsCache[a.itemID];
+			}
+			else {
+				var sql = "SELECT lastName, firstName, fieldMode FROM itemCreators "
+							+ "JOIN creators USING (creatorID) "
+							+ "JOIN creatorData USING (creatorDataID) "
+							+ "WHERE itemID=? ORDER BY orderIndex LIMIT 10";
+				aCreatorRows = Zotero.DB.query(sql, a.itemID);
+				creatorRowsCache[a.itemID] = aCreatorRows;
+			}
+			
+			// Check for at least one match on last name + first initial of first name
+			if (typeof creatorRowsCache[b.itemID] != 'undefined') {
+				bCreatorRows = creatorRowsCache[b.itemID];
+			}
+			else {
+				var sql = "SELECT lastName, firstName, fieldMode FROM itemCreators "
+							+ "JOIN creators USING (creatorID) "
+							+ "JOIN creatorData USING (creatorDataID) "
+							+ "WHERE itemID=? ORDER BY orderIndex LIMIT 10";
+				bCreatorRows = Zotero.DB.query(sql, b.itemID);
+				creatorRowsCache[b.itemID] = bCreatorRows;
+			}
+			
+			// Match if no creators
+			if (!aCreatorRows && !bCreatorRows) {
+				return 1;
+			}
+			
+			if (!aCreatorRows || !bCreatorRows) {
+				return 0;
+			}
+			
+			for each(var aCreatorRow in aCreatorRows) {
+				var aLastName = normalizeString(aCreatorRow.lastName);
+				var aFirstInitial = aCreatorRow.fieldMode == 0 ? normalizeString(aCreatorRow.firstName).charAt(0) : false;
 				
-				if (aLastName === bLastName && aFirstInitial === bFirstInitial) {
-					return 1;
+				for each(var bCreatorRow in bCreatorRows) {
+					var bLastName = normalizeString(bCreatorRow.lastName);
+					var bFirstInitial = bCreatorRow.fieldMode == 0 ? normalizeString(bCreatorRow.firstName).charAt(0) : false;
+					
+					if (aLastName === bLastName && aFirstInitial === bFirstInitial) {
+						return 1;
+					}
 				}
 			}
-		}
-		
-		return 0;
-	}, true);
+			
+			return 0;
+		}, true);
+	}
 	
 	// Match on exact fields
 	/*var fields = [''];
diff --git a/chrome/content/zotero/xpcom/file.js b/chrome/content/zotero/xpcom/file.js
index a4b53f1fdc..084c56bf9f 100644
--- a/chrome/content/zotero/xpcom/file.js
+++ b/chrome/content/zotero/xpcom/file.js
@@ -149,7 +149,7 @@ Zotero.File = new function(){
 	 * @param {nsIFile|nsIInputStream} file The file to read
 	 * @param {String} [charset] The character set; defaults to UTF-8
 	 * @param {Integer} [maxLength] The maximum number of characters to read
-	 * @return {Promise} A promise that is resolved with the contents of the file
+	 * @return {Promise} A Q promise that is resolved with the contents of the file
 	 */
 	this.getContentsAsync = function getContentsAsync(file, charset, maxLength) {
 		charset = charset ? Zotero.CharacterSets.getName(charset) : "UTF-8";
@@ -167,6 +167,26 @@ Zotero.File = new function(){
 	};
 	
 	
+	/**
+	 * Get the contents of a binary source asynchronously
+	 *
+	 * @param {nsIURI|nsIFile|string spec|nsIChannel|nsIInputStream} source The source to read
+	 * @return {Promise} A Q promise that is resolved with the contents of the source
+	 */
+	this.getBinaryContentsAsync = function (source) {
+		var deferred = Q.defer();
+		NetUtil.asyncFetch(source, function(inputStream, status) {
+			if (!Components.isSuccessCode(status)) {
+				deferred.reject(new Components.Exception("Source read operation failed", status));
+				return;
+			}
+			
+			deferred.resolve(NetUtil.readInputStreamToString(inputStream, inputStream.available()));
+		});
+		return deferred.promise;
+	}
+	
+	
 	/*
 	 * Return the contents of a URL as a string
 	 *
@@ -208,7 +228,7 @@ Zotero.File = new function(){
 	 * @param {String|nsIInputStream} data The string or nsIInputStream to write to the
 	 *     file
 	 * @param {String} [charset] The character set; defaults to UTF-8
-	 * @return {Promise} A promise that is resolved when the file has been written
+	 * @return {Promise} A Q promise that is resolved when the file has been written
 	 */
 	this.putContentsAsync = function putContentsAsync(file, data, charset) {
 		// Create a stream for async stream copying
@@ -462,58 +482,49 @@ Zotero.File = new function(){
 	}
 	
 	
-	// TODO: localize
 	this.checkFileAccessError = function (e, file, operation) {
 		if (file) {
-			var str = "The file '" + file.path + "' ";
+			var str = Zotero.getString('file.accessError.theFile', file.path);
 		}
 		else {
-			var str = "A file ";
+			var str = Zotero.getString('file.accessError.aFile');
 		}
 		
 		switch (operation) {
 			case 'create':
-				var opWord = "created";
+				var opWord = Zotero.getString('file.accessError.created');
 				break;
 				
 			case 'update':
-				var opWord = "updated";
+				var opWord = Zotero.getString('file.accessError.updated');
 				break;
 				
 			case 'delete':
-				var opWord = "deleted";
+				var opWord = Zotero.getString('file.accessError.deleted');
 				break;
 				
 			default:
-				var opWord = "updated";
+				var opWord = Zotero.getString('file.accessError.updated');
 		}
 		
 		if (e.name == 'NS_ERROR_FILE_ACCESS_DENIED' || e.name == 'NS_ERROR_FILE_IS_LOCKED'
 				// Shows up on some Windows systems
 				|| e.name == 'NS_ERROR_FAILURE') {
 			Zotero.debug(e);
-			// TODO: localize
-			str = str + "cannot be " + opWord + ".";
-			var checkFileWindows = "Check that the file is not currently "
-				+ "in use and that it is not marked as read-only. To check "
-				+ "all files in your Zotero data directory, right-click on "
-				+ "the 'zotero' directory, click Properties, clear "
-				+ "the Read-Only checkbox, and apply the change to all folders "
-				+ "and files in the directory.";
-			var checkFileOther = "Check that the file is not currently "
-				+ "in use and that its permissions allow write access.";
+			str = str + " " + Zotero.getString('file.accessError.cannotBe') + " " + opWord + ".";
+			var checkFileWindows = Zotero.getString('file.accessError.message.windows');
+			var checkFileOther = Zotero.getString('file.accessError.message.other');
 			var msg = str + " "
 					+ (Zotero.isWin ? checkFileWindows : checkFileOther)
 					+ "\n\n"
-					+ "Restarting your computer or disabling security "
-					+ "software may also help.";
+					+ Zotero.getString('file.accessError.restart');
 			
 			if (operation == 'create') {
 				var e = new Zotero.Error(
 					msg,
 					0,
 					{
-						dialogButtonText: "Show Parent Directory",
+						dialogButtonText: Zotero.getString('file.accessError.showParentDir'),
 						dialogButtonCallback: function () {
 							try {
 								file.parent.QueryInterface(Components.interfaces.nsILocalFile).reveal();
@@ -531,7 +542,7 @@ Zotero.File = new function(){
 					msg,
 					0,
 					{
-						dialogButtonText: "Show File",
+						dialogButtonText: Zotero.getString('locate.showFile.label'),
 						dialogButtonCallback: function () {
 							try {
 								file.QueryInterface(Components.interfaces.nsILocalFile);
diff --git a/chrome/content/zotero/xpcom/http.js b/chrome/content/zotero/xpcom/http.js
index fa948cf93f..c551a1adeb 100644
--- a/chrome/content/zotero/xpcom/http.js
+++ b/chrome/content/zotero/xpcom/http.js
@@ -40,6 +40,7 @@ Zotero.HTTP = new function() {
 	 *         <li>cookieSandbox - The sandbox from which cookies should be taken</li>
 	 *         <li>debug - Log response text and status code</li>
 	 *         <li>dontCache - If set, specifies that the request should not be fulfilled from the cache</li>
+	 *         <li>headers - HTTP headers to include in the request</li>
 	 *         <li>responseType - The type of the response. See XHR 2 documentation for legal values</li>
 	 *         <li>responseCharset - The charset the response should be interpreted as</li>
 	 *         <li>successCodes - HTTP status codes that are considered successful</li>
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index 01f32a9867..4309489faf 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -217,13 +217,16 @@ Zotero.ItemTreeView.prototype._setTreeGenerator = function(treebox)
 				
 				tree.disableKeyNavigation = false;
 				self._skipKeyPress = true;
-				var nsIDWU = Components.interfaces.nsIDOMWindowUtils
+				var nsIDWU = Components.interfaces.nsIDOMWindowUtils;
 				var domWindowUtils = event.originalTarget.ownerDocument.defaultView
 					.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
 					.getInterface(nsIDWU);
 				var modifiers = 0;
+				if (event.altKey) {
+					modifiers |= nsIDWU.MODIFIER_ALT;
+				}
 				if (event.ctrlKey) {
-					modifiers |= nsIDWU.MODIFIER_CTRL;
+					modifiers |= nsIDWU.MODIFIER_CONTROL;
 				}
 				if (event.shiftKey) {
 					modifiers |= nsIDWU.MODIFIER_SHIFT;
@@ -1261,6 +1264,7 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 	var collation = Zotero.getLocaleCollation();
 	
 	// Year is really the date field truncated
+	var originalColumnField = columnField;
 	if (columnField == 'year') {
 		columnField = 'date';
 	}
@@ -1286,7 +1290,7 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 	
 	// Get the display field for a row (which might be a placeholder title)
 	var getField;
-	switch (columnField) {
+	switch (originalColumnField) {
 		case 'title':
 			getField = function (row) {
 				var field;
@@ -1333,6 +1337,19 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 			};
 			break;
 		
+		case 'year':
+			getField = function (row) {
+				var val = row.getField(columnField, unformatted);
+				if (val) {
+					val = val.substr(0, 4);
+					if (val == '0000') {
+						val = "";
+					}
+				}
+				return val;
+			};
+			break;
+		
 		default:
 			getField = function (row) row.getField(columnField, unformatted);
 	}
@@ -1350,8 +1367,8 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 		
 		switch (columnField) {
 			case 'date':
-				fieldA = a.getField('date', true).substr(0, 10);
-				fieldB = b.getField('date', true).substr(0, 10);
+				fieldA = getField(a).substr(0, 10);
+				fieldB = getField(b).substr(0, 10);
 				
 				cmp = strcmp(fieldA, fieldB);
 				if (cmp !== 0) {
@@ -2957,36 +2974,61 @@ Zotero.ItemTreeView.prototype.getCellProperties = function(row, col, prop) {
 	var treeRow = this._getItemAtRow(row);
 	var itemID = treeRow.ref.id;
 	
+	var props = [];
+	
 	// Mark items not matching search as context rows, displayed in gray
 	if (this._searchMode && !this._searchItemIDs[itemID]) {
-		var aServ = Components.classes["@mozilla.org/atom-service;1"].
-			getService(Components.interfaces.nsIAtomService);
-		prop.AppendElement(aServ.getAtom("contextRow"));
+		// <=Fx21
+		if (prop) {
+			var aServ = Components.classes["@mozilla.org/atom-service;1"].
+				getService(Components.interfaces.nsIAtomService);
+			prop.AppendElement(aServ.getAtom("contextRow"));
+		}
+		// Fx22+
+		else {
+			props.push("contextRow");
+		}
 	}
 	
 	// Mark hasAttachment column, which needs special image handling
 	if (col.id == 'zotero-items-column-hasAttachment') {
-		var aServ = Components.classes["@mozilla.org/atom-service;1"].
-				getService(Components.interfaces.nsIAtomService);
-		prop.AppendElement(aServ.getAtom("hasAttachment"));
+		// <=Fx21
+		if (prop) {
+			var aServ = Components.classes["@mozilla.org/atom-service;1"].
+					getService(Components.interfaces.nsIAtomService);
+			prop.AppendElement(aServ.getAtom("hasAttachment"));
+		}
+		// Fx22+
+		else {
+			props.push("hasAttachment");
+		}
 		
 		// Don't show pie for open parent items, since we show it for the
 		// child item
 		if (this.isContainer(row) && this.isContainerOpen(row)) {
-			return;
+			return props.join(" ");
 		}
 		
 		var num = Zotero.Sync.Storage.getItemDownloadImageNumber(treeRow.ref);
 		//var num = Math.round(new Date().getTime() % 10000 / 10000 * 64);
 		if (num !== false) {
-			if (!aServ) {
-				var aServ = Components.classes["@mozilla.org/atom-service;1"].
-						getService(Components.interfaces.nsIAtomService);
+			// <=Fx21
+			if (prop) {
+				if (!aServ) {
+					var aServ = Components.classes["@mozilla.org/atom-service;1"].
+							getService(Components.interfaces.nsIAtomService);
+				}
+				prop.AppendElement(aServ.getAtom("pie"));
+				prop.AppendElement(aServ.getAtom("pie" + num));
+			}
+			// Fx22+
+			else {
+				props.push("pie", "pie" + num);
 			}
-			prop.AppendElement(aServ.getAtom("pie"));
-			prop.AppendElement(aServ.getAtom("pie" + num));
 		}
 	}
+	
+	return props.join(" ");
 }
 
 Zotero.ItemTreeView.TreeRow = function(ref, level, isOpen)
diff --git a/chrome/content/zotero/xpcom/storage.js b/chrome/content/zotero/xpcom/storage.js
index f05039e3a2..0728867fe4 100644
--- a/chrome/content/zotero/xpcom/storage.js
+++ b/chrome/content/zotero/xpcom/storage.js
@@ -53,9 +53,8 @@ Zotero.Sync.Storage = new function () {
 	this.ERROR_FILE_MISSING_AFTER_UPLOAD = -16;
 	
 	// TEMP
-	// TODO: localize
-	this.__defineGetter__("defaultError", function () "A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart " + Zotero.appName + " and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.");
-	this.__defineGetter__("defaultErrorRestart", function () "A file sync error occurred. Please restart " + Zotero.appName + " and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.");
+	this.__defineGetter__("defaultError", function () Zotero.getString('sync.storage.error.default', Zotero.appName));
+	this.__defineGetter__("defaultErrorRestart", function () Zotero.getString('sync.storage.error.defaultRestart', Zotero.appName));
 	
 	//
 	// Public properties
@@ -106,22 +105,9 @@ Zotero.Sync.Storage = new function () {
 			
 			if (Zotero.Sync.Storage.ZFS.includeUserFiles) {
 				libraryModes[0] = Zotero.Sync.Storage.ZFS;
-				return;
 			}
-			
-			if (Zotero.Sync.Storage.WebDAV.includeUserFiles) {
-				if (!Zotero.Sync.Storage.WebDAV.verified) {
-					Zotero.debug("WebDAV file sync is not active");
-					
-					// Try to verify server now if it hasn't been
-					return Zotero.Sync.Storage.checkServerPromise(Zotero.Sync.Storage.WebDAV)
-					.then(function () {
-						libraryModes[0] = Zotero.Sync.Storage.WebDAV;
-					});
-				}
-				
+			else if (Zotero.Sync.Storage.WebDAV.includeUserFiles) {
 				libraryModes[0] = Zotero.Sync.Storage.WebDAV;
-				return;
 			}
 		})
 		.then(function () {
@@ -143,15 +129,47 @@ Zotero.Sync.Storage = new function () {
 			for each(var mode in libraryModes) {
 				if (modes.indexOf(mode) == -1) {
 					modes.push(mode);
-					promises.push(mode.cacheCredentials());
+					
+					// Try to verify WebDAV server first if it hasn't been
+					if (mode == Zotero.Sync.Storage.WebDAV
+							&& !Zotero.Sync.Storage.WebDAV.verified) {
+						Zotero.debug("WebDAV file sync is not active");
+						var promise = Zotero.Sync.Storage.checkServerPromise(Zotero.Sync.Storage.WebDAV)
+							.then(function () {
+								mode.cacheCredentials();
+							});
+					}
+					else {
+						var promise = mode.cacheCredentials();
+					}
+					promises.push(Q.allResolved([mode, promise]));
 				}
 			}
 			return Q.allResolved(promises)
 			// Get library last-sync times
-			.then(function () {
+			.then(function (cacheCredentialsPromises) {
 				var promises = [];
+				
+				// Mark WebDAV verification failure as user library error.
+				// We ignore credentials-caching errors for ZFS and let the
+				// later requests fail.
+				cacheCredentialsPromises.forEach(function (p) {
+					p = p.valueOf();
+					let mode = p[0].valueOf();
+					if (mode == Zotero.Sync.Storage.WebDAV) {
+						if (p[1].isRejected()) {
+							promises.push(Q.allResolved(
+								[0, p[1]]
+							));
+							// Skip further syncing of user library
+							delete libraryModes[0];
+						}
+					}
+				});
+				
 				for (var libraryID in libraryModes) {
 					libraryID = parseInt(libraryID);
+					
 					// Get the last sync time for each library
 					if (self.downloadOnSync(libraryID)) {
 						promises.push(Q.allResolved(
@@ -220,14 +238,23 @@ Zotero.Sync.Storage = new function () {
 				
 				// If we don't have any forced downloads, we can skip
 				// downloads if the last sync time hasn't changed
-				if (downloadAll && !downloadForced && lastSyncTime) {
-					var version = self.getStoredLastSyncTime(
-						libraryModes[libraryID], libraryID
-					);
-					if (version == lastSyncTime) {
-						Zotero.debug("Last " + libraryModes[libraryID].name
-							+ " sync time hasn't changed for library "
-							+ libraryID + " -- skipping file downloads");
+				// or doesn't exist on the server (meaning there are no files)
+				if (downloadAll && !downloadForced) {
+					if (lastSyncTime) {
+						var version = self.getStoredLastSyncTime(
+							libraryModes[libraryID], libraryID
+						);
+						if (version == lastSyncTime) {
+							Zotero.debug("Last " + libraryModes[libraryID].name
+								+ " sync time hasn't changed for library "
+								+ libraryID + " -- skipping file downloads");
+							downloadAll = false;
+						}
+					}
+					else {
+						Zotero.debug("No last " + libraryModes[libraryID].name
+							+ " sync time for library " + libraryID
+							+ " -- skipping file downloads");
 						downloadAll = false;
 					}
 				}
@@ -695,7 +722,7 @@ Zotero.Sync.Storage = new function () {
 		var items = Zotero.Items.get(itemIDs);
 		for each(var item in items) {
 			var lk = libraryID + "/" + item.key;
-			Zotero.debug("Checking attachment file for item " + lk);
+			//Zotero.debug("Checking attachment file for item " + lk);
 			var file = item.getFile(attachmentData[item.id]);
 			if (!file) {
 				Zotero.debug("Marking attachment " + lk + " as missing");
@@ -713,8 +740,8 @@ Zotero.Sync.Storage = new function () {
 			
 			var fmtime = item.attachmentModificationTime;
 			
-			Zotero.debug("Stored mtime is " + attachmentData[item.id].mtime);
-			Zotero.debug("File mtime is " + fmtime);
+			//Zotero.debug("Stored mtime is " + attachmentData[item.id].mtime);
+			//Zotero.debug("File mtime is " + fmtime);
 			
 			// Download-marking mode
 			if (itemModTimes) {
@@ -1189,8 +1216,7 @@ Zotero.Sync.Storage = new function () {
 			// but log a warning and skip the file
 			else if (e.name == "NS_ERROR_FAILURE" && Zotero.isLinux && destFile.leafName.length > 130) {
 				Zotero.debug(e);
-				var msg = "Error creating file '" + destFile.leafName + "'\n\n"
-					+ "See http://www.zotero.org/support/kb/encrypted_filenames for more information.";
+				var msg = Zotero.getString('sync.storage.error.encryptedFilenames', destFile.leafName);
 				Components.utils.reportError(msg);
 				return;
 			}
@@ -1394,9 +1420,7 @@ Zotero.Sync.Storage = new function () {
 				// can result in a lower limit -- not much we can do about this,
 				// but log a warning and skip the file
 				else if (e.name == "NS_ERROR_FAILURE" && Zotero.isLinux && destFile.leafName.length > 130) {
-					// TODO: localize
-					var msg = "Error creating file '" + destFile.leafName + "'. "
-						+ "See http://www.zotero.org/support/kb/encrypted_filenames for more information.";
+					var msg = Zotero.getString('sync.storage.error.encryptedFilenames', destFile.leafName);
 					Components.utils.reportError(msg);
 					continue;
 				}
@@ -1460,9 +1484,7 @@ Zotero.Sync.Storage = new function () {
 						// See above
 						if (e.name == "NS_ERROR_FAILURE" && Zotero.isLinux && destFile.leafName.length > 130) {
 							Zotero.debug(e);
-							// TODO: localize
-							var msg = "Error creating file '" + destFile.leafName + "'. "
-								+ "See http://www.zotero.org/support/kb/encrypted_filenames for more information.";
+							var msg = Zotero.getString('sync.storage.error.encryptedFilenames', destFile.leafName);
 							Components.utils.reportError(msg);
 							continue;
 						}
diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js
index f9571c5b21..9b4002e2c4 100644
--- a/chrome/content/zotero/xpcom/storage/webdav.js
+++ b/chrome/content/zotero/xpcom/storage/webdav.js
@@ -25,11 +25,6 @@
 
 
 Zotero.Sync.Storage.WebDAV = (function () {
-	// TEMP
-	// TODO: localize
-	var _defaultError = "A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.";
-	var _defaultErrorRestart = "A WebDAV file sync error occurred. Please restart " + Zotero.appName + " and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.";
-	
 	var _initialized = false;
 	var _parentURI;
 	var _rootURI;
@@ -48,6 +43,8 @@ Zotero.Sync.Storage.WebDAV = (function () {
 	 * @param	{Function}		callback		Callback f(item, mdate)
 	 */
 	function getStorageModificationTime(item) {
+		var funcName = "Zotero.Sync.Storage.WebDAV.getStorageModificationTime()";
+		
 		var uri = getItemPropertyURI(item);
 		
 		return Zotero.HTTP.promise(
@@ -56,8 +53,6 @@ Zotero.Sync.Storage.WebDAV = (function () {
 			.then(function (req) {
 				checkResponse(req);
 				
-				var funcName = "Zotero.Sync.Storage.WebDAV.getStorageModificationTime()";
-				
 				// mod_speling can return 300s for 404s with base name matches
 				if (req.status == 404 || req.status == 300) {
 					return false;
@@ -110,7 +105,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
 					Components.utils.reportError(msg);
 					return deleteStorageFiles([item.key + ".prop"])
 					.then(function (results) {
-						throw new Error(_defaultError);
+						throw new Error(Zotero.Sync.Storage.WebDAV.defaultError);
 					});
 				}
 				
@@ -118,7 +113,6 @@ Zotero.Sync.Storage.WebDAV = (function () {
 			})
 			.catch(function (e) {
 				if (e instanceof Zotero.HTTP.UnexpectedStatusException) {
-					Zotero.debug(req.responseText);
 					throw new Error("Unexpected status code " + e.status + " in " + funcName);
 				}
 				throw e;
@@ -271,7 +265,9 @@ Zotero.Sync.Storage.WebDAV = (function () {
 						},
 						onStop: function (httpRequest, status, response, data) {
 							deferred.resolve(
-								onUploadComplete(httpRequest, status, response, data)
+								Q.fcall(function () {
+									return onUploadComplete(httpRequest, status, response, data);
+								})
 							);
 						},
 						onCancel: function (httpRequest, status, data) {
@@ -640,13 +636,21 @@ Zotero.Sync.Storage.WebDAV = (function () {
 	var obj = new Zotero.Sync.Storage.Mode;
 	obj.name = "WebDAV";
 	
+	Object.defineProperty(obj, "defaultError", {
+		get: function () Zotero.getString('sync.storage.error.webdav.default')
+	});
+	
+	Object.defineProperty(obj, "defaultErrorRestart", {
+		get: function () Zotero.getString('sync.storage.error.webdav.defaultRestart', Zotero.appName)
+	});
+	
 	Object.defineProperty(obj, "includeUserFiles", {
 		get: function () {
 			return Zotero.Prefs.get("sync.storage.enabled") && Zotero.Prefs.get("sync.storage.protocol") == 'webdav';
 		}
 	});
 	obj.includeGroupItems = false;
-		
+	
 	Object.defineProperty(obj, "_verified", {
 		get: function () Zotero.Prefs.get("sync.storage.verified")
 	});
@@ -880,7 +884,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
 									+ " in Zotero.Sync.Storage.WebDAV.downloadFile()";
 								Zotero.debug(msg, 1);
 								Components.utils.reportError(msg);
-								deferred.reject(_defaultError);
+								deferred.reject(Zotero.Sync.Storage.WebDAV.defaultError);
 								return;
 							}
 							
@@ -942,7 +946,11 @@ Zotero.Sync.Storage.WebDAV = (function () {
 		Zotero.Sync.Storage.createUploadFile(
 			request,
 			function (data) {
-				deferred.resolve(processUploadFile(data));
+				deferred.resolve(
+					Q.fcall(function () {
+						return processUploadFile(data);
+					})
+				);
 			}
 		);
 		return deferred.promise;
@@ -1030,7 +1038,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
 				var msg = "Unexpected error code " + req.status + " uploading storage success file";
 				Zotero.debug(msg, 2);
 				Components.utils.reportError(msg);
-				throw _defaultError;
+				throw Zotero.Sync.Storage.WebDAV.defaultError;
 			});
 	};
 	
@@ -1054,7 +1062,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
 					+ "for OPTIONS request caching WebDAV credentials";
 				Zotero.debug(msg, 1);
 				Components.utils.reportError(msg);
-				throw new Error(_defaultErrorRestart);
+				throw new Error(Zotero.Sync.Storage.WebDAV.defaultErrorRestart);
 			}
 			throw e;
 		});
@@ -1409,22 +1417,14 @@ Zotero.Sync.Storage.WebDAV = (function () {
 				return false;
 			
 			case Zotero.Sync.Storage.ERROR_FILE_MISSING_AFTER_UPLOAD:
-				// TODO: localize
 				var errorTitle = Zotero.getString("general.warning");
-				var errorMessage = "A potential problem was found with your WebDAV server.\n\n"
-					+ "An uploaded file was not immediately available for download. There may be a "
-					+ "short delay between when you upload files and when they become available, "
-					+ "particularly if you are using a cloud storage service.\n\n"
-					+ "If Zotero file syncing appears to work normally, "
-					+ "you can ignore this message. "
-					+ "If you have trouble, please post to the Zotero Forums.";
+				var errorMessage = Zotero.getString('sync.storage.error.webdav.fileMissingAfterUpload');
 				Zotero.Prefs.set("sync.storage.verified", true);
 				break;
 			
 			case Zotero.Sync.Storage.ERROR_SERVER_ERROR:
-				// TODO: localize
-				var errorTitle = "WebDAV Server Configuration Error";
-				var errorMessage = "Your WebDAV server returned an internal error."
+				var errorTitle = Zotero.getString('sync.storage.error.webdav.serverConfig.title');
+				var errorMessage = Zotero.getString('sync.storage.error.webdav.serverConfig')
 					+ "\n\n" + Zotero.getString('sync.storage.error.checkFileSyncSettings');
 				break;
 			
diff --git a/chrome/content/zotero/xpcom/storage/zfs.js b/chrome/content/zotero/xpcom/storage/zfs.js
index e2c6dbf50c..1309b68c9c 100644
--- a/chrome/content/zotero/xpcom/storage/zfs.js
+++ b/chrome/content/zotero/xpcom/storage/zfs.js
@@ -27,6 +27,9 @@
 Zotero.Sync.Storage.ZFS = (function () {
 	var _rootURI;
 	var _userURI;
+	var _headers = {
+		"Zotero-API-Version" : ZOTERO_CONFIG.API_VERSION
+	};
 	var _cachedCredentials = false;
 	
 	/**
@@ -38,7 +41,7 @@ Zotero.Sync.Storage.ZFS = (function () {
 	function getStorageFileInfo(item) {
 		var funcName = "Zotero.Sync.Storage.ZFS.getStorageFileInfo()";
 		
-		return Zotero.HTTP.promise("GET", getItemInfoURI(item), { successCodes: [200, 404] })
+		return Zotero.HTTP.promise("GET", getItemInfoURI(item), { successCodes: [200, 404], headers: _headers })
 			.then(function (req) {
 				if (req.status == 404) {
 					return false;
@@ -58,10 +61,7 @@ Zotero.Sync.Storage.ZFS = (function () {
 					catch (e) {
 						Zotero.debug("Response headers unavailable");
 					}
-					// TODO: localize?
-					var msg = "A file sync error occurred. Please restart " + Zotero.appName + " and/or your computer and try syncing again.\n\n"
-						+ "If the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. "
-						+ "Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.";
+					var msg = Zotero.getString('sync.storage.error.zfs.restart', Zotero.appName);
 					throw msg;
 				}
 				info.filename = req.getResponseHeader('X-Zotero-Filename');
@@ -235,7 +235,7 @@ Zotero.Sync.Storage.ZFS = (function () {
 			body += "&zip=1";
 		}
 		
-		return Zotero.HTTP.promise("POST", uri, { body: body, debug: true })
+		return Zotero.HTTP.promise("POST", uri, { body: body, headers: _headers, debug: true })
 			.then(function (req) {
 				if (!req.responseXML) {
 					throw new Error("Invalid response retrieving file upload parameters");
@@ -268,10 +268,8 @@ Zotero.Sync.Storage.ZFS = (function () {
 						var retry = e.xmlhttp.getResponseHeader('Retry-After');
 						if (retry) {
 							var minutes = Math.round(retry / 60);
-							// TODO: localize
 							var e = new Zotero.Error(
-								"You have too many queued uploads. "
-									+ "Please try again in " + minutes + " minutes.",
+								Zotero.getString('sync.storage.error.zfs.tooManyQueuedUploads', minutes),
 								"ZFS_UPLOAD_QUEUE_LIMIT"
 							);
 							throw e;
@@ -301,11 +299,10 @@ Zotero.Sync.Storage.ZFS = (function () {
 							}
 						}
 						
-						// TODO: localize
 						text += "\n\n" + filename + " (" + Math.round(file.fileSize / 1024) + "KB)";
 						
 						var e = new Zotero.Error(
-							"The file '" + filename + "' would exceed your Zotero File Storage quota",
+							Zotero.getString('sync.storage.error.zfs.fileWouldExceedQuota', filename),
 							"ZFS_OVER_QUOTA",
 							{
 								dialogText: text,
@@ -514,7 +511,7 @@ Zotero.Sync.Storage.ZFS = (function () {
 		var body = "update=" + uploadKey + "&mtime=" + item.attachmentModificationTime;
 		
 		// Register upload on server
-		return Zotero.HTTP.promise("POST", uri, { body: body, successCodes: [204] })
+		return Zotero.HTTP.promise("POST", uri, { body: body, headers: _headers, successCodes: [204] })
 			.then(function (req) {
 				updateItemFileInfo(item);
 				return {
@@ -892,7 +889,7 @@ Zotero.Sync.Storage.ZFS = (function () {
 		})
 		.then(function () {
 			return Zotero.HTTP.promise("GET", lastSyncURI,
-				{ debug: true, successCodes: [200, 404] });
+				{ headers: _headers, successCodes: [200, 404], debug: true });
 		})
 		.then(function (req) {
 			// Not yet synced
@@ -935,8 +932,15 @@ Zotero.Sync.Storage.ZFS = (function () {
 		
 		var lastSyncURI = this._getLastSyncURI(libraryID);
 		
-		return Zotero.HTTP.promise("POST", lastSyncURI, { debug: true })
+		return Zotero.HTTP.promise("POST", lastSyncURI, { headers: _headers, successCodes: [200, 404], debug: true })
 			.then(function (req) {
+				// Not yet synced
+				//
+				// TODO: Don't call this at all if no files uploaded
+				if (req.status == 404) {
+					return;
+				}
+				
 				var ts = req.responseText;
 				
 				var sql = "REPLACE INTO version VALUES (?, ?)";
@@ -986,7 +990,7 @@ Zotero.Sync.Storage.ZFS = (function () {
 		// TODO: move to root uri
 		uri.spec += "?auth=1";
 		
-		return Zotero.HTTP.promise("GET", uri).
+		return Zotero.HTTP.promise("GET", uri, { headers: _headers }).
 			then(function (req) {
 				Zotero.debug("Credentials are cached");
 				_cachedCredentials = true;
diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js
index a15ca007bf..67a14dbf10 100644
--- a/chrome/content/zotero/xpcom/sync.js
+++ b/chrome/content/zotero/xpcom/sync.js
@@ -538,7 +538,7 @@ Zotero.Sync.Runner = new function () {
 		
 		if (Zotero.HTTP.browserIsOffline()){
 			this.clearSyncTimeout(); // DEBUG: necessary?
-			var msg = "Zotero cannot sync while " + Zotero.appName + " is in offline mode.";
+			var msg = "Zotero cannot sync because " + Zotero.getString('general.browserIsOffline', Zotero.appName);
 			var e = new Zotero.Error(msg, 0, { dialogButtonText: null })
 			Components.utils.reportError(e);
 			Zotero.debug(e, 1);
@@ -628,7 +628,7 @@ Zotero.Sync.Runner = new function () {
 	this.warning = function (e) {
 		Zotero.debug(e, 2);
 		Components.utils.reportError(e);
-		e.status = 'warning';
+		e.errorMode = 'warning';
 		_warning = e;
 	}
 	
@@ -636,7 +636,7 @@ Zotero.Sync.Runner = new function () {
 	this.error = function (e) {
 		if (typeof e == 'string') {
 			e = new Error(e);
-			e.status = 'error';
+			e.errorMode = 'error';
 		}
 		Zotero.debug(e, 1);
 		Zotero.Sync.Runner.setSyncIcon(e);
@@ -733,6 +733,10 @@ Zotero.Sync.Runner = new function () {
 	 * library-specific sync error icons across all windows
 	 */
 	this.setErrors = function (errors) {
+		if (!errors) {
+			errors = [];
+		}
+		
 		errors = [this.parseSyncError(e) for each(e in errors)];
 		_errorsByLibrary = {};
 		
@@ -770,7 +774,7 @@ Zotero.Sync.Runner = new function () {
 		errors = [this.parseSyncError(e) for each(e in errors)];
 		
 		// Set highest priority error as the primary (sync error icon)
-		var statusPriorities = {
+		var errorModes = {
 			info: 1,
 			warning: 2,
 			error: 3,
@@ -781,11 +785,11 @@ Zotero.Sync.Runner = new function () {
 		};
 		var primaryError = false;
 		for each(var error in errors) {
-			if (!error.status || statusPriorities[error.status] == -1) {
+			if (!error.errorMode || errorModes[error.errorMode] == -1) {
 				continue;
 			}
-			if (!primaryError || statusPriorities[error.status]
-						> statusPriorities[primaryError.status]) {
+			if (!primaryError || errorModes[error.errorMode]
+						> errorModes[primaryError.errorMode]) {
 				primaryError = error;
 			}
 		}
@@ -800,7 +804,7 @@ Zotero.Sync.Runner = new function () {
 		e = this.parseSyncError(e);
 		
 		if (Zotero.Sync.Server.upgradeRequired) {
-			e.status = 'upgrade';
+			e.errorMode = 'upgrade';
 			Zotero.Sync.Server.upgradeRequired = false;
 		}
 		
@@ -839,9 +843,9 @@ Zotero.Sync.Runner = new function () {
 			
 			var syncIcon = doc.getElementById('zotero-tb-sync');
 			// Update sync icon state
-			syncIcon.setAttribute('status', e.status ? e.status : "");
+			syncIcon.setAttribute('status', e.errorMode ? e.errorMode : "");
 			// Disable button while spinning
-			syncIcon.disabled = e.status == 'animate';
+			syncIcon.disabled = e.errorMode == 'animate';
 		}
 		
 		// Clear status
@@ -874,7 +878,7 @@ Zotero.Sync.Runner = new function () {
 		// In addition to actual errors, string states (e.g., 'animate')
 		// can be passed
 		if (typeof e == 'string') {
-			parsed.status = e;
+			parsed.errorMode = e;
 			return parsed;
 		}
 		
@@ -886,7 +890,7 @@ Zotero.Sync.Runner = new function () {
 		if (typeof e.libraryID != 'undefined') {
 			parsed.libraryID = e.libraryID;
 		}
-		parsed.status = e.status ? e.status : 'error';
+		parsed.errorMode = e.errorMode ? e.errorMode : 'error';
 		
 		if (e.data) {
 			if (e.data.dialogText) {
@@ -898,8 +902,9 @@ Zotero.Sync.Runner = new function () {
 			}
 		}
 		if (!parsed.message) {
-			// TODO: include file name and line?
 			parsed.message = e.message ? e.message : e;
+			parsed.fileName = e.fileName;
+			parsed.lineNumber = e.lineNumber;
 		}
 		
 		parsed.frontWindowOnly = !!(e && e.data && e.data.frontWindowOnly);
@@ -922,14 +927,14 @@ Zotero.Sync.Runner = new function () {
 		// TEMP: for now, use the first error
 		var e = this.getPrimaryError(errors);
 		
-		if (!e.status) {
+		if (!e.errorMode) {
 			icon.hidden = true;
 			icon.onclick = null;
 			return;
 		}
 		
 		icon.hidden = false;
-		icon.setAttribute('mode', e.status);
+		icon.setAttribute('mode', e.errorMode);
 		icon.onclick = function () {
 			var doc = this.ownerDocument;
 			
@@ -958,12 +963,16 @@ Zotero.Sync.Runner = new function () {
 		e = this.parseSyncError(e);
 		
 		var desc = doc.createElement('description');
-		desc.textContent = e.message;
+		var msg = e.message;
+		/*if (e.fileName) {
+			msg += '\n\nFile: ' + e.fileName + '\nLine: ' + e.lineNumber;
+		}*/
+		desc.textContent = msg;
 		panelContent.appendChild(desc);
 		
 		// If not an error and there's no explicit button text, don't show
 		// button to report errors
-		if (e.status != 'error' && typeof e.buttonText == 'undefined') {
+		if (e.errorMode != 'error' && typeof e.buttonText == 'undefined') {
 			e.buttonText = null;
 		}
 		
@@ -1356,6 +1365,7 @@ Zotero.Sync.Server = new function () {
 		
 		var self = this;
 		
+		Zotero.Sync.Runner.setErrors();
 		Zotero.Sync.Runner.setSyncIcon('animate');
 		
 		if (!_sessionID) {
@@ -1631,6 +1641,9 @@ Zotero.Sync.Server = new function () {
 								Zotero.Sync.Server.nextLocalSyncDate = false;
 								Zotero.Sync.Server.lastRemoteSyncTime = response.getAttribute('timestamp');
 								
+								var sql = "UPDATE syncedSettings SET synced=1";
+								Zotero.DB.query(sql);
+								
 								//throw('break2');
 								
 								Zotero.DB.commitTransaction();
@@ -1851,28 +1864,28 @@ Zotero.Sync.Server = new function () {
 					catch (e) {
 						Zotero.debug(e);
 					}
-					// TODO: localize
-					_error("SSL certificate error connecting to " + host
-						+ "\n\nSee http://zotero.org/support/kb/ssl_certificate_error for more information.",
+					var kbURL = 'http://zotero.org/support/kb/ssl_certificate_error';
+					_error(Zotero.getString('sync.storage.error.webdav.sslCertificateError', host) + "\n\n"
+						+ Zotero.getString('general.seeForMoreInformation', kbURL),
 						false, noReloadOnFailure);
 				}
 				else if ((secInfo.securityState & Ci.nsIWebProgressListener.STATE_IS_BROKEN) == Ci.nsIWebProgressListener.STATE_IS_BROKEN) {
-					_error("SSL connection error", false, noReloadOnFailure);
+					_error(Zotero.getString('sync.error.sslConnectionError'), false, noReloadOnFailure);
 				}
 			}
-			// TODO: localize
 			if (xmlhttp.status === 0) {
-				_error('Error connecting to server. Check your Internet connection.', false, noReloadOnFailure);
+				_error(Zotero.getString('sync.error.checkConnection'), false, noReloadOnFailure);
 			}
-			_error('Empty response from server. Please try again in a few minutes.', false, noReloadOnFailure);
+			_error(Zotero.getString('sync.error.emptyResponseServer') + Zotero.getString('general.tryAgainLater'),
+				false, noReloadOnFailure);
 		}
 		
 		if (!xmlhttp.responseXML || !xmlhttp.responseXML.childNodes[0] ||
 				xmlhttp.responseXML.childNodes[0].tagName != 'response' ||
 				!xmlhttp.responseXML.childNodes[0].firstChild) {
 			Zotero.debug(xmlhttp.responseText);
-			// TODO: localize
-			_error('Invalid response from server. Please try again in a few minutes.', xmlhttp.responseText, noReloadOnFailure);
+			_error(Zotero.getString('general.invalidResponseServer') + Zotero.getString('general.tryAgainLater'),
+				xmlhttp.responseText, noReloadOnFailure);
 		}
 		
 		var firstChild = xmlhttp.responseXML.firstChild.firstChild;
@@ -2079,8 +2092,7 @@ Zotero.Sync.Server = new function () {
 				case 'INVALID_TIMESTAMP':
 					var validClock = Zotero.DB.valueQuery("SELECT CURRENT_TIMESTAMP BETWEEN '1970-01-01 00:00:01' AND '2038-01-19 03:14:07'");
 					if (!validClock) {
-						// TODO: localize
-						_error("The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.");
+						_error(Zotero.getString('sync.error.invalidClock'));
 					}
 					
 					setTimeout(function () {
@@ -2186,37 +2198,20 @@ Zotero.Sync.Server = new function () {
 			+ ps.BUTTON_POS_1_DEFAULT
 			+ ps.BUTTON_DELAY_ENABLE;
 			
-			var msg = "This Zotero database was last synced with a different "
-					+ "zotero.org account ('" + lastUsername + "') from the "
-					+ "current one ('" + username + "'). ";
+			var msg = Zotero.getString('sync.lastSyncWithDifferentAccount', [lastUsername, username]);
 			
 			if (!noServerData) {
-				// TODO: localize
-				msg += "If you continue, local Zotero data will be "
-						+ "combined with data from the '" + username + "' account "
-						+ "stored on the server.";
+				msg += " " + Zotero.getString('sync.localDataWillBeCombined', username);
 				// If there are local groups belonging to the previous user,
 				// we need to remove them
 				if (groups.length) {
-					msg += "Local groups, including any with changed items, will also "
-							+ "be removed.";
+					msg += " " + Zotero.getString('sync.localGroupsWillBeRemoved1');
 				}
-				msg += "\n\n"
-						+ "To avoid combining or losing data, revert to the '"
-						+ lastUsername + "' account or use the Reset options "
-						+ "in the Sync pane of the Zotero preferences.";
-				
-				var syncButtonText = "Sync";
+				msg += "\n\n" + Zotero.getString('sync.avoidCombiningData', lastUsername);
+				var syncButtonText = Zotero.getString('sync.sync');
 			}
 			else if (groups.length) {
-				msg += "If you continue, local groups, including any with changed items, "
-						+ "will be removed and replaced with groups linked to the '"
-						+ username + "' account."
-						+ "\n\n"
-						+ "To avoid losing local changes to groups, be sure you "
-						+ "have synced with the '" + lastUsername + "' account before "
-						+ "syncing with the '" + username + "' account.";
-				
+				msg += " " + Zotero.getString('sync.localGroupsWillBeRemoved2', [username, lastUsername]);
 				var syncButtonText = Zotero.getString('sync.removeGroupsAndSync');
 			}
 			// If there are no local groups and the server is empty,
@@ -2335,9 +2330,8 @@ Zotero.Sync.Server = new function () {
 					// instead of creating its own dialog, but setSyncIcon() doesn't yet provide full control
 					// over dialog title and primary button text/action, which is why this version of the
 					// dialog is a bit uglier than the manual click version
-					// TODO: localize and combine with below
-					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.";
+					// TODO: localize (=>done) and combine with below (=>?)
+					var msg = Zotero.getString('sync.error.invalidLogin.text');
 					e.data = {};
 					e.data.dialogText = msg;
 					e.data.dialogButtonText = Zotero.getString('sync.openSyncPreferences');
@@ -2358,15 +2352,13 @@ Zotero.Sync.Server = new function () {
 									.getService(Components.interfaces.nsIPromptService);
 						var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
 											+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_CANCEL);
-						// TODO: localize
 						if (e.error == Zotero.Error.ERROR_SYNC_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."
+							var msg = Zotero.getString('sync.error.usernameNotSet.text');
 						}
 						else {
 							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.";
+							var msg = Zotero.getString('sync.error.invalidLogin.text');
 						}
 						var index = ps.confirmEx(
 							win,
@@ -3219,10 +3211,9 @@ Zotero.Sync.Server.Data = new function() {
 				if (Zotero.Sync.Runner.background) {
 					Zotero.Sync.Server.manualSyncRequired = true;
 					
-					// TODO: localize again
-					//Zotero.getString('sync.error.manualInterventionRequired')
-					//Zotero.getString('sync.error.clickSyncIcon')
-					var msg = "Conflicts have suspended automatic syncing.\n\nClick the sync icon to resolve them.";
+					var msg = Zotero.getString('sync.error.manualInterventionRequired')
+					  + "\n\n"
+					  + Zotero.getString('sync.error.clickSyncIcon');
 					var e = new Zotero.Error(msg, 0, { dialogButtonText: null });
 					throw (e);
 				}
@@ -3708,20 +3699,17 @@ Zotero.Sync.Server.Data = new function() {
 			var remoteDelete = true;
 		}
 		
-		// TODO: localize
-		var msg = "One or more locally deleted Zotero " + itemTypes + " have been "
-			+ "modified remotely since the last sync. ";
+		var msg = Zotero.getString('sync.conflict.autoChange.alert', itemTypes) + " ";
 		if (localDelete) {
-			msg += "The remote versions have been kept.";
+			msg += Zotero.getString('sync.conflict.remoteVersionsKept');
 		}
 		else if (remoteDelete) {
-			msg += "The local versions have been kept.";
+			msg += Zotero.getString('sync.conflict.localVersionsKept');
 		}
 		else {
-			msg += "The most recent versions have been kept.";
+			msg += Zotero.getString('sync.conflict.recentVersionsKept');
 		}
-		msg += "\n\nView the " + (Zotero.isStandalone ? "" : "Firefox ")
-				+ "Error Console for the full list of such changes.";
+		msg += "\n\n" + Zotero.getString('sync.conflict.viewErrorConsole', (Zotero.isStandalone ? "" : " Firefox"));
 		return msg;
 	}
 	
@@ -3734,42 +3722,35 @@ Zotero.Sync.Server.Data = new function() {
 	 */
 	function _generateAutoChangeLogMessage(itemType, localName, remoteName, remoteMoreRecent) {
 		if (localName === null) {
-			// TODO: localize
-			localName = "[deleted]";
+			localName = Zotero.getString('sync.conflict.deleted');
 			var localDelete = true;
 		}
 		else if (remoteName === null) {
-			remoteName = "[deleted]";
+			remoteName = Zotero.getString('sync.conflict.deleted');
 			var remoteDelete = true;
 		}
 		
-		// TODO: localize
-		var msg = "A Zotero " + itemType + " has changed both locally and "
-			+ "remotely since the last sync:";
+		var msg = Zotero.getString('sync.conflict.autoChange.log', itemType) + "\n\n";
+		msg += Zotero.getString('sync.conflict.localVersion', localName);
+		msg += Zotero.getString('sync.conflict.remoteVersion', remoteName);
 		msg += "\n\n";
-		msg += "Local version: " + localName + "\n";
-		msg += "Remote version: " + remoteName + "\n";
-		msg += "\n";
 		if (localDelete) {
-			msg += "The remote version has been kept.";
+			msg += Zotero.getString('sync.conflict.remoteVersionKept');
 		}
 		else if (remoteDelete) {
-			msg += "The local version has been kept.";
+			msg += Zotero.getString('sync.conflict.localVersionKept');
 		}
 		else {
 			var moreRecent = remoteMoreRecent ? remoteName : localName;
-			msg += "The most recent version, '" + moreRecent + "', has been kept.";
+			msg += Zotero.getString('sync.conflict.recentVersionKept', moreRecent);
 		}
 		return msg;
 	}
 	
 	
 	function _generateCollectionItemMergeAlertMessage() {
-		// TODO: localize
-		var msg = "One or more Zotero items have been added to and/or removed "
-			+ "from the same collection on multiple computers since the last sync.\n\n"
-			+ "View the " + (Zotero.isStandalone ? "" : "Firefox ")
-			+ "Error Console for the full list of such changes.";
+		var msg = Zotero.getString('sync.conflict.collectionItemMerge.alert')
+			+ Zotero.getString('sync.conflict.viewErrorConsole', (Zotero.isStandalone ? "" : "Firefox "));
 		return msg;
 	}
 	
@@ -3779,11 +3760,7 @@ Zotero.Sync.Server.Data = new function() {
 	 * @param	{Integer[]}		addedItemIDs
 	 */
 	function _generateCollectionItemMergeLogMessage(collectionName, addedItemIDs) {
-		// TODO: localize
-		var introMsg = "Zotero items in the collection '" + collectionName + "' have been "
-			+ "added and/or removed on multiple computers since the last sync. "
-		
-		introMsg += "The following items have been added to the collection:";
+		var introMsg = Zotero.getString('sync.conflict.collectionItemMerge.log', collectionName);
 		var itemText = [];
 		var max = addedItemIDs.length;
 		for (var i=0; i<max; i++) {
@@ -3807,12 +3784,8 @@ Zotero.Sync.Server.Data = new function() {
 	
 	
 	function _generateTagItemMergeAlertMessage() {
-		// TODO: localize
-		var msg = "One or more Zotero tags have been added to and/or removed from "
-			+ "items on multiple computers since the last sync. "
-			+ "The different sets of tags have been combined.\n\n"
-			+ "View the " + (Zotero.isStandalone ? "" : "Firefox ")
-			+ "Error Console for the full list of such changes.";
+		var msg = Zotero.getString('sync.conflict.tagItemMerge.alert')
+			+ Zotero.getString('sync.conflict.viewErrorConsole', (Zotero.isStandalone ? "" : "Firefox "));
 		return msg;
 	}
 	
@@ -3823,15 +3796,13 @@ Zotero.Sync.Server.Data = new function() {
 	 * @param	{Boolean}		remoteIsTarget
 	 */
 	function _generateTagItemMergeLogMessage(tagName, addedItemIDs, remoteIsTarget) {
-		// TODO: localize
-		var introMsg = "The Zotero tag '" + tagName + "' has been added to and/or "
-			+ "removed from items on multiple computers since the last sync. "
+		var introMsg = Zotero.getString('sync.conflict.tagItemMerge.log', tagName) + " ";
 		
 		if (remoteIsTarget) {
-			introMsg += "It has been added to the following remote items:";
+			introMsg += Zotero.getString('sync.conflict.tag.addedToRemote');
 		}
 		else {
-			introMsg += "It has been added to the following local items:";
+			introMsg += Zotero.getString('sync.conflict.tag.addedToLocal');
 		}
 		var itemText = [];
 		for each(var id in addedItemIDs) {
@@ -3996,9 +3967,7 @@ Zotero.Sync.Server.Data = new function() {
 				var path = item.attachment.path;
 				if (path != _xmlize(path)) {
 					var filename = item.attachment.path.substr(8);
-					// TODO: localize
-					var msg = "The filename '" + filename + "' contains invalid characters.\n\nRename the file and try again. "
-						+ "If you rename the file via the OS, you will need to relink it in Zotero.";
+					var msg = Zotero.getString('sync.error.invalidCharsFilename', filename);
 					var e = new Zotero.Error(msg, 0, { dialogButtonText: null });
 					throw (e);
 
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
index d95ef2e312..38b9f5da29 100644
--- a/chrome/content/zotero/xpcom/translation/translate.js
+++ b/chrome/content/zotero/xpcom/translation/translate.js
@@ -93,17 +93,24 @@ Zotero.Translate.Sandbox = {
 			delete item.complete;
 			for(var i in item) {
 				var val = item[i];
-				var type = typeof val;
 				if(!val && val !== 0) {
 					// remove null, undefined, and false properties, and convert objects to strings
 					delete item[i];
-				} else if(type === "string") {
-					// trim strings
-					item[i] = val.trim();
-				} else if((type === "object" || type === "xml" || type === "function") && allowedObjects.indexOf(i) === -1) {
-					// convert things that shouldn't be objecst to objects
+					continue;
+				}
+
+				var isObject = typeof val === "object" || typeof val === "xml" || typeof val === "function",
+					shouldBeObject = allowedObjects.indexOf(i) !== -1;
+				if(isObject && !shouldBeObject) {
+					// Convert things that shouldn't be objects to objects
 					translate._debug("Translate: WARNING: typeof "+i+" is "+type+"; converting to string");
 					item[i] = val.toString();
+				} else if(shouldBeObject && !isObject) {
+					translate._debug("Translate: WARNING: typeof "+i+" is "+type+"; converting to array");
+					item[i] = [val];
+				} else if(typeof val === "string") {
+					// trim strings
+					item[i] = val.trim();
 				}
 			}
 			
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index c0f34267f3..25ca42a965 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -33,6 +33,7 @@ const ZOTERO_CONFIG = {
 	WWW_BASE_URL: 'http://www.zotero.org/',
 	SYNC_URL: 'https://sync.zotero.org/',
 	API_URL: 'https://api.zotero.org/',
+	API_VERSION: 2,
 	PREF_BRANCH: 'extensions.zotero.',
 	BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/',
 	VERSION: "4.0a1.SOURCE"
@@ -555,17 +556,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 			
 			var dir = Zotero.getProfileDirectory();
 			dir.append('zotero');
-			
-			var zs = Zotero.getString('app.standalone');
-			var zf = Zotero.getString('app.firefox');
-			// TODO: localize
-			var msg = "The currently selected data directory is not compatible "
-					+ "with " + zs + ", which can share a database only with "
-					+ zf + " 2.1b3 or later."
-					+ "\n\n"
-					+ "Upgrade to the latest version of " + zf + " first or select a "
-					+ "different data directory for use with " + zs + ".";
-					
+
 			var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
 						.createInstance(Components.interfaces.nsIPromptService);
 			var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
@@ -574,13 +565,12 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 				+ ps.BUTTON_POS_2_DEFAULT;
 			var index = ps.confirmEx(
 				null,
-				// TODO: localize
-				"Incompatible Database Version",
-				msg,
+				Zotero.getString('dataDir.incompatibleDbVersion.title'),
+				Zotero.getString('dataDir.incompatibleDbVersion.text'),
 				buttonFlags,
-				"Use Default",
+				Zotero.getString('general.useDefault'),
 				Zotero.getString('dataDir.standaloneMigration.selectCustom'),
-				"Quit",
+				Zotero.getString('general.quit'),
 				null,
 				{}
 			);
@@ -1081,13 +1071,8 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 					else {
 						var buttonFlags = ps.STD_YES_NO_BUTTONS;
 						var index = ps.confirmEx(null,
-							//Zotero.getString('dataDir.selectedDirEmpty.title'),
-							//Zotero.getString('dataDir.selectedDirEmpty.text'),
-							'Directory Empty',
-							'The directory you selected is empty. To move an existing Zotero data directory, '
-							+ 'you will need to manually copy files from the existing data directory to the new location. '
-							+ 'See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?',
-							
+							Zotero.getString('dataDir.selectedDirEmpty.title'),
+							Zotero.getString('dataDir.selectedDirEmpty.text'),
 							buttonFlags, null, null, null, null, {});
 						
 						// Not OK -- return to file picker
@@ -1735,15 +1720,15 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 		
 		var modes = {
 			titleCreatorYear: {
-				label: "Title, Creator, Year"
+				label: Zotero.getString('quickSearch.mode.titleCreatorYear')
 			},
 			
 			fields: {
-				label: "All Fields & Tags"
+				label: Zotero.getString('quickSearch.mode.fieldsAndTags')
 			},
 			
 			everything: {
-				label: "Everything"
+				label: Zotero.getString('quickSearch.mode.everything')
 			}
 		};
 		
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 2bcfa0e43f..c903b6b19c 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -1275,8 +1275,7 @@ var ZoteroPane = new function()
 			if (itemGroup.isDuplicates()) {
 				if (!itemGroup.editable) {
 					if (count) {
-						// TODO: localize
-						var msg = "Library write access is required to merge items.";
+						var msg = Zotero.getString('pane.item.duplicates.writeAccessRequired');
 					}
 					else {
 						var msg = Zotero.getString('pane.item.selected.zero');
@@ -1302,7 +1301,7 @@ var ZoteroPane = new function()
 					Zotero_Duplicates_Pane.setItems(this.getSelectedItems(), displayNumItemsOnTypeError);
 				}
 				else {
-					var msg = Zotero.getString('pane.item.selectToMerge');
+					var msg = Zotero.getString('pane.item.duplicates.selectToMerge');
 					this.setItemPaneMessage(msg);
 				}
 			}
@@ -1415,12 +1414,10 @@ var ZoteroPane = new function()
 			+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_CANCEL);
 		var index = ps.confirmEx(
 			null,
-			// TODO: localize
-			"PDF Tools Not Installed",
-			"To use this feature, you must first install the PDF tools in "
-				+ "the Zotero preferences.",
+			Zotero.getString('pane.item.attachments.PDF.installTools.title'),
+			Zotero.getString('pane.item.attachments.PDF.installTools.text'),
 			buttonFlags,
-			"Open Preferences",
+			Zotero.getString('general.openPreferences'),
 			null, null, null, {}
 		);
 		if (index == 0) {
@@ -2374,6 +2371,11 @@ var ZoteroPane = new function()
 		var t = event.originalTarget;
 		var tree = t.parentNode;
 		
+		// Ignore click on column headers
+		if (!tree.treeBoxObject) {
+			return;
+		}
+		
 		var row = {}, col = {}, obj = {};
 		tree.treeBoxObject.getCellAt(event.clientX, event.clientY, row, col, obj);
 		if (row.value == -1) {
@@ -2938,9 +2940,9 @@ var ZoteroPane = new function()
 		var input = {};
 		var check = {value : false};
 		
-		// TODO: Localize
 		// TODO: Allow title to be specified?
-		var result = ps.prompt(null, "Attach Link to URI", "Enter a URI:", input, "", {});
+		var result = ps.prompt(null, Zotero.getString('pane.items.attach.link.uri.title'),
+			Zotero.getString('pane.items.attach.link.uri'), input, "", {});
 		if (!result || !input.value) return false;
 		
 		// Create a new attachment
@@ -3705,7 +3707,7 @@ var ZoteroPane = new function()
 							+ ps.BUTTON_POS_1 * ps.BUTTON_TITLE_IS_STRING;
 		
 		// Warning
-		if (e.status == 'warning') {
+		if (e.errorMode == 'warning') {
 			var title = Zotero.getString('general.warning');
 			
 			// If secondary button not specified, just use an alert
@@ -3732,7 +3734,7 @@ var ZoteroPane = new function()
 			}
 		}
 		// Error
-		else if (e.status == 'error') {
+		else if (e.errorMode == 'error') {
 			var title = Zotero.getString('general.error');
 			
 			// If secondary button is explicitly null, just use an alert
@@ -3767,7 +3769,7 @@ var ZoteroPane = new function()
 			}
 		}
 		// Upgrade
-		else if (e.status == 'upgrade') {
+		else if (e.errorMode == 'upgrade') {
 			ps.alert(null, "", e.message);
 		}
 	};
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index a1be11f076..11d6cd4758 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
     ***** BEGIN LICENSE BLOCK *****
     
@@ -39,7 +39,7 @@
 	
 	<script src="include.js"/>
 	<script src="zoteroPane.js" type="application/javascript;version=1.8"/>
-    <script src="fileInterface.js"/>
+	<script src="fileInterface.js"/>
 	<script src="reportInterface.js"/>
 	<script src="timelineInterface.js"/>
 	<script src="recognizePDF.js"/>
@@ -144,10 +144,19 @@
 								onpopuphidden="Zotero_Lookup.onHidden(event)">
 							<vbox>
 								<description>&zotero.lookup.description;</description>
-								<stack>
-									<progressmeter id="zotero-lookup-progress" mode="undetermined" hidden="true"/>
-									<textbox id="zotero-lookup-textbox" onkeypress="return Zotero_Lookup.onKeyPress(event)" flex="1"/>
-								</stack>
+								<vbox id="zotero-lookup-singleLine">
+									<stack>
+										<progressmeter id="zotero-lookup-progress" mode="undetermined" collapsed="true"/>
+										<textbox id="zotero-lookup-textbox" onkeypress="return Zotero_Lookup.onKeyPress(event, this)" oninput="Zotero_Lookup.adjustTextbox(this)" flex="1" newlines="pasteintact"/>
+									</stack>
+								</vbox>
+								<vbox id="zotero-lookup-multiline" collapsed="true">
+									<textbox id="zotero-lookup-multiline-textbox" onkeypress="return Zotero_Lookup.onKeyPress(event, this)" multiline="true" rows="5" wrap="off" flex="1"/>
+									<hbox align="start" id="zotero-lookup-buttons" class="zotero-button-clear-image">
+										<button label="&zotero.lookup.button.search;" align="start" oncommand="Zotero_Lookup.accept(document.getElementById('zotero-lookup-multiline-textbox'))"/>
+										<progressmeter id="zotero-lookup-multiline-progress" mode="undetermined" collapsed="true" flex="1"/>
+									</hbox>
+								</vbox>
 							</vbox>
 						</panel>
 					</toolbarbutton>
diff --git a/chrome/locale/af-ZA/zotero/about.dtd b/chrome/locale/af-ZA/zotero/about.dtd
index 497df9983c..c05ccba2cc 100644
--- a/chrome/locale/af-ZA/zotero/about.dtd
+++ b/chrome/locale/af-ZA/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Spesiale dank:">
 <!ENTITY zotero.about.close "Sluit">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/af-ZA/zotero/preferences.dtd b/chrome/locale/af-ZA/zotero/preferences.dtd
index f50096b482..098cf25849 100644
--- a/chrome/locale/af-ZA/zotero/preferences.dtd
+++ b/chrome/locale/af-ZA/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Verstek:">
 <!ENTITY zotero.preferences.items "items">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Algemeen">
 
@@ -59,9 +60,14 @@
 <!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.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.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.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.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">
@@ -70,6 +76,7 @@
 <!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 "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reset...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Snelsleutels">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Any string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Advanced">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Kies...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
diff --git a/chrome/locale/af-ZA/zotero/standalone.dtd b/chrome/locale/af-ZA/zotero/standalone.dtd
index f63a223052..e02c6a5a54 100644
--- a/chrome/locale/af-ZA/zotero/standalone.dtd
+++ b/chrome/locale/af-ZA/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/af-ZA/zotero/zotero.dtd b/chrome/locale/af-ZA/zotero/zotero.dtd
index d1e6e0ef05..8fc526e6ab 100644
--- a/chrome/locale/af-ZA/zotero/zotero.dtd
+++ b/chrome/locale/af-ZA/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Redigeer">
 <!ENTITY zotero.general.delete "Skrap">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "The error log may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Wag asseblief terwyl die foutboodskap voorgelê word">
 <!ENTITY zotero.errorReport.submitted "Die foutboodskap is voorgelê">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Pos asseblief 'n boodskap aan die Zotero-forum (forums.zoter.org) met hierdie Verslag-ID, 'n beskrywing van die probleem en enige stappe wat nodig is om dit te reproduseer.">
 <!ENTITY zotero.errorReport.notReviewed "Error reports are generally not reviewed unless referred to in the forums.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "'n Nuwe weergawe van Zotero in geïnstalleer">
 <!ENTITY zotero.upgrade.upgradeRequired "Die Zotero-databasis moet bygewerk word om by die nuwe weergawe aan te pas.">
 <!ENTITY zotero.upgrade.autoBackup "Die bestaande databasis sal automaties gerugsteun word voor enige veranderinge gemaak word.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Regte">
 <!ENTITY zotero.items.dateAdded_column "Datum bygevoeg">
 <!ENTITY zotero.items.dateModified_column "Date Modified">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Show in Library">
 <!ENTITY zotero.items.menu.attach.note "Add Note">
@@ -75,8 +93,8 @@
 
 <!ENTITY zotero.toolbar.newItem.label "New Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label "More">
-<!ENTITY zotero.toolbar.newItemFromPage.label "Create New Item from Current Page">
-<!ENTITY zotero.toolbar.lookup.label "Add Item by Identifier">
+<!ENTITY zotero.toolbar.newItemFromPage.label "Create Web Page Item from Current Page">
+<!ENTITY zotero.toolbar.lookup.label "Add Item(s) by Identifier">
 <!ENTITY zotero.toolbar.removeItem.label "Remove Item...">
 <!ENTITY zotero.toolbar.newCollection.label "New Collection...">
 <!ENTITY zotero.toolbar.newGroup "New Group...">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transform Text">
 <!ENTITY zotero.item.textTransform.titlecase "Title Case">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "New Note">
 <!ENTITY zotero.toolbar.note.standalone "New Standalone Note">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Select visible">
 <!ENTITY zotero.tagSelector.clearVisible "Deselect visible">
 <!ENTITY zotero.tagSelector.clearAll "Deselect all">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Rename Tag...">
 <!ENTITY zotero.tagSelector.deleteTag "Delete Tag...">
 
-<!ENTITY zotero.lookup.description "Enter the ISBN, DOI, or PMID to look up in the box below.">
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
+<!ENTITY zotero.lookup.description "Enter one or more ISBNs, DOIs, or PMIDs to look up in the box below.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Select Items">
 <!ENTITY zotero.selectitems.intro.label "Select which items you'd like to add to your library">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Ongekontroleerde etikette sal nie gestoor word nie.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Die etiket sal geskrap word van alle items.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Volmag erken">
 <!ENTITY zotero.proxy.recognized.warning "Voeg slegs volmag wat aan u biblioteek, skool of korporatiewe webwerf gekoppel is, by">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Deur ander volmag by te voeg, laat kwaadwillige werwe toe om hulle as werwe wat u vertrou voor te doen.">
diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties
index df8a91108a..a1e0892121 100644
--- a/chrome/locale/af-ZA/zotero/zotero.properties
+++ b/chrome/locale/af-ZA/zotero/zotero.properties
@@ -14,8 +14,11 @@ general.restartLater=Restart later
 general.restartApp=Restart %S
 general.errorHasOccurred=An error has occurred.
 general.unknownErrorOccurred=An unknown error occurred.
-general.restartFirefox=Please restart %S.
-general.restartFirefoxAndTryAgain=Please restart %S and try again.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
+general.restartFirefox=Please restart Firefox.
+general.restartFirefoxAndTryAgain=Please restart Firefox and try again.
 general.checkForUpdate=Check for update
 general.actionCannotBeUndone=This action cannot be undone.
 general.install=Install
@@ -35,8 +38,12 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -57,7 +64,7 @@ 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 %S to try the upgrade again.
+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...
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Press %S to send an error report to the Zotero develo
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=The Zotero data directory could not be found.
 dataDir.previousDir=Previous directory:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Use %S profile directory
 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?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=New Saved Search
 pane.collections.savedSearchName=Enter a name for this saved search:
 pane.collections.rename=Rename collection:
 pane.collections.library=My Library
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Trash
 pane.collections.untitled=Untitled
 pane.collections.unfiled=Unfiled Items
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Are you sure you want to delete this tag?\n\nThe
 pane.tagSelector.numSelected.none=0 tags selected
 pane.tagSelector.numSelected.singular=%S tag selected
 pane.tagSelector.numSelected.plural=%S tags selected
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Loading items list...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
 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?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S items selected
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Change Item Type
 pane.item.changeType.text=Are you sure you want to change the item type?\n\nThe following fields will be lost:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S attachments:
 pane.item.attachments.count.singular=%S attachment:
 pane.item.attachments.count.plural=%S attachments:
 pane.item.attachments.select=Select a File
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=click here
-pane.item.tags=Tags:
 pane.item.tags.count.zero=%S tags:
 pane.item.tags.count.singular=%S tag:
 pane.item.tags.count.plural=%S tags:
 pane.item.tags.icon.user=User-added tag
 pane.item.tags.icon.automatic=Automatically added tag
-pane.item.related=Related:
 pane.item.related.count.zero=%S related:
 pane.item.related.count.singular=%S related:
 pane.item.related.count.plural=%S related:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=Saving Item...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Item Saved
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
@@ -427,13 +468,14 @@ ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
-db.dbCorrupted.restart=Please restart %S to attempt an automatic restore from the last backup.
+db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
 db.dbCorruptedNoBackup=The Zotero database '%S' appears to have become corrupted, and no automatic backup is available.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
 db.dbRestored=The Zotero database '%1$S' appears to have become corrupted.\n\nYour data was restored from the last automatic backup made on %2$S at %3$S. The damaged file was saved in your Zotero directory.
 db.dbRestoreFailed=The Zotero database '%S' appears to have become corrupted, and an attempt to restore from the last automatic backup failed.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S resolvers found
 zotero.preferences.openurl.resolversFound.singular=%S resolver found
 zotero.preferences.openurl.resolversFound.plural=%S resolvers found
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Rebuild Index
 zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
 zotero.preferences.search.clearIndex=Clear Index
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Any new or modified tra
 zotero.preferences.advanced.resetStyles=Reset Styles
 zotero.preferences.advanced.resetStyles.changesLost=Any new or modified styles will be lost.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
 
@@ -500,7 +559,8 @@ fileInterface.import=Import
 fileInterface.export=Export
 fileInterface.exportedItems=Exported Items
 fileInterface.imported=Imported
-fileInterface.fileFormatUnsupported=No translator could be found for the given file.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 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.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=The items you have selected contain no reference
 fileInterface.bibliographyGenerationError=An error occurred generating your bibliography. Please try again.
 fileInterface.exportError=An error occurred while trying to export the selected file.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Advanced search mode — press Enter to search.
 searchInProgress=Search in progress — please wait.
 
@@ -613,11 +677,12 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Blank Citation
 integration.emptyCitationWarning.body=The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Error
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Zotero experienced an error updating your document.
 integration.error.mustInsertCitation=You must insert a citation before performing this operation.
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Install style "%1$S" from %2$S?
 styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
 styles.installed=The style "%S" was installed successfully.
-styles.installError=%S does not appear to be a valid style file.
+styles.installError="%S" is not a valid style file.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 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?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancel Sync
 sync.openSyncPreferences=Open Sync Preferences...
 sync.resetGroupAndSync=Reset Group and Sync
@@ -660,18 +733,55 @@ sync.remoteObject=Remote Object
 sync.mergedObject=Merged Object
 
 sync.error.usernameNotSet=Username not set
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Password not set
 sync.error.invalidLogin=Invalid username or password
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 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 %S.
+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 '%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.error.manualInterventionRequired=Conflicts have suspended automatic syncing.
+sync.error.clickSyncIcon=Click the sync icon to resolve them.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Not yet synced
 sync.status.lastSync=Last sync:
@@ -682,9 +792,12 @@ 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.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB remaining
 sync.storage.filesRemaining=%1$S/%2$S files
 sync.storage.none=None
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Local File
 sync.storage.remoteFile=Remote File
 sync.storage.savedFile=Saved File
@@ -692,17 +805,23 @@ sync.storage.serverConfigurationVerified=Server configuration verified
 sync.storage.fileSyncSetUp=File sync is successfully set up.
 sync.storage.openAccountSettings=Open Account Settings
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=The server %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=%S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
 sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=You no longer have file editing access to the Zotero group '%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=%S does not exist.
 sync.storage.error.createNow=Do you want to create it now?
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
 sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1=The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2=The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Save Tag
 sync.longTagFixer.saveTags=Save Tags
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Could not read text from PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=File not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Close
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(Scanned)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/ar/zotero/about.dtd b/chrome/locale/ar/zotero/about.dtd
index 54a1a28d02..a13c2a7f18 100644
--- a/chrome/locale/ar/zotero/about.dtd
+++ b/chrome/locale/ar/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "شكر خاص:">
 <!ENTITY zotero.about.close "إغلاق">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "المزيد من الشكر والتقدير">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/ar/zotero/preferences.dtd b/chrome/locale/ar/zotero/preferences.dtd
index 5a0a723646..ae4403d074 100644
--- a/chrome/locale/ar/zotero/preferences.dtd
+++ b/chrome/locale/ar/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "الإفتراضي:">
 <!ENTITY zotero.preferences.items "عناصر">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "عام">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "الرابط:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "قم بمزامنة الملفات المرفقة في مكتبتي باستخدام">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "قم بمزامنة الملفات المرفقة في مجموعة المكتبات باستخدام مساحة تخزين زوتيرو">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "باستخدامك مساحة تخزين زوتيرو، فإنك توافق على الالتزام بكافة">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "الشروط والأحكام">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "التزامن الكامل مع خادم زوتيرو">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "دمج بيانات زوتيرو المحلية مع البيانات من خادم التزامن، مع تجاهل سجل التزامن.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "الاسترجاع من خادم زوتيرو">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "حذف جميع بيانات الخادم وإحلال بيانات زوتيرو المحلية على الخادم.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "إعادة تعيين ملف سجل المزامنة">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "تنفيذ عملية التحقق من الخادم لتخزين جميع الملفات المحلية المرفقة.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "إعادة التعيين...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "اسم النمط">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "آخر تحديث">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "احصل على انماط اضافية...">
 
 <!ENTITY zotero.preferences.prefpane.keys "اختصارات">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - لأي سلسلة حرفية">
 
 <!ENTITY zotero.preferences.prefpane.advanced "متقدم">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "تحديد موقع المقتنى">
 <!ENTITY zotero.preferences.locate.locateEngineManager "إدارة محرك البحث">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "اختر...">
 <!ENTITY zotero.preferences.dataDir.reveal "عرض مجلد البيانات">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "صيانة قاعدة البيانات">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "التأكد من سلامة قاعدة البيانات">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "اعادة تعيين المترجمات والانماط...">
diff --git a/chrome/locale/ar/zotero/standalone.dtd b/chrome/locale/ar/zotero/standalone.dtd
index dab98e413c..8afc80f84c 100644
--- a/chrome/locale/ar/zotero/standalone.dtd
+++ b/chrome/locale/ar/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "إغلاق">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "ق">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "حول اسم العلامة التجارية القصير؛">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "مساعدة ووثائق">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "معلومات المساعدة والتنويه">
 <!ENTITY helpTroubleshootingInfo.accesskey "م">
 <!ENTITY helpFeedbackPage.label "ارسال ملاحظات">
diff --git a/chrome/locale/ar/zotero/zotero.dtd b/chrome/locale/ar/zotero/zotero.dtd
index 524be27d01..2813b45c5e 100644
--- a/chrome/locale/ar/zotero/zotero.dtd
+++ b/chrome/locale/ar/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "تحرير">
 <!ENTITY zotero.general.delete "حذف">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "قد يتضمن سجل الاخطاء على رسائل ليس لها علاقة بزوتيرو.">
 <!ENTITY zotero.errorReport.submissionInProgress "برجاء الانتظار لحين الانتهاء من ارسال التقرير عن الخطأ.">
 <!ENTITY zotero.errorReport.submitted "تم ارسال التقرير عن الخطأ.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "برجاء كتابة رسالة في منتديات زوتيرو (forums.zotero.org) تتضمن رقم التقرير، ووصف للمشكلة، والخطوات التي تؤدي لظهورها.">
 <!ENTITY zotero.errorReport.notReviewed "لن يتم مراجعة تقارير الخطأ ما لم يكن مشار إليها في المنتديات.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "لقد قمتَ بتنصيب نسخة جديدة من زوتيرو.">
 <!ENTITY zotero.upgrade.upgradeRequired "يجب ترقية قاعدة بيانات زوتيرو لكي تعمل مع النسخة الجديدة.">
 <!ENTITY zotero.upgrade.autoBackup "سيتم عمل نسخة احتياطية من قاعدة البيانات قبل إجراء أي تغييرات.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "الملكية الفكرية">
 <!ENTITY zotero.items.dateAdded_column "تاريخ الإضافة">
 <!ENTITY zotero.items.dateModified_column "تاريخ التعديل">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "عرض في المكتبة">
 <!ENTITY zotero.items.menu.attach.note "اضافة ملاحظة">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "تغيير حالة النص">
 <!ENTITY zotero.item.textTransform.titlecase "حرف كبير في بداية كل كلمة">
 <!ENTITY zotero.item.textTransform.sentencecase "حالة الجملة">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "ملاحظة جديدة">
 <!ENTITY zotero.toolbar.note.standalone "ملاحظة جديدة مستقلة بذاتها">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "تحديد العناصر الظاهرة">
 <!ENTITY zotero.tagSelector.clearVisible "إلغاء تحديد العناصر الظاهرة">
 <!ENTITY zotero.tagSelector.clearAll "إلغاء تحديد الكل">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "تغيير اسم الوسم...">
 <!ENTITY zotero.tagSelector.deleteTag "حذف الوسم...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "ادخل الترقيم الدولي الموحد للكتاب او معرف مقالات الميدلاين او معرف الوثيقة الرقمية.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "تحديد العناصر">
 <!ENTITY zotero.selectitems.intro.label "حدد العناصر التي تريد إضافتها لمكتبتك">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "لن يتم حفظ الاوسمة الغير محددة.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "سيتم حذف الوسم من جميع العناصر.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "التعرف على الوكيل">
 <!ENTITY zotero.proxy.recognized.warning "قم فقط بإضافة الوكلاء التي لها وصلات على موقع مكتبتك او مدرستك او شركتك">
 <!ENTITY zotero.proxy.recognized.warning.secondary "إضافة وكلاء أخرين يسمح للمواقع الضارة بالتنكر كمواقع موثوق بها.">
diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties
index 9fc166e94a..44a2febaf6 100644
--- a/chrome/locale/ar/zotero/zotero.properties
+++ b/chrome/locale/ar/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=إعادة التشغيل لاحقاً
 general.restartApp=Restart %S
 general.errorHasOccurred=حدث خطأ.
 general.unknownErrorOccurred=حدث خطأ غير معروف.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=برجاء أعادة تشغيل %S.
 general.restartFirefoxAndTryAgain=برجاء أعادة تشغيل %S ثم أعد المحاولة مرة أخرى.
 general.checkForUpdate=التحقق من وجود تحديث
@@ -35,8 +38,12 @@ general.seeForMoreInformation=شاهد %S لمزيد من المعلومات.
 general.enable=تمكين
 general.disable=تعطيل
 general.remove=حذف
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=عملية زوتيرو حاليا في التقدم.
 general.operationInProgress.waitUntilFinished=يرجى الانتظار لحين انتهاء.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=اضغط على %S لإرسال بلاغ عن خطأ
 errorReport.stepsToReproduce=خطوات لإعادة ظهور الخطأ:
 errorReport.expectedResult=النتيجة المتوقعة:
 errorReport.actualResult=النتيجة الفعلية:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=تعذر إيجاد مجلد بيانات زوتيرو.
 dataDir.previousDir=المجلد السابق:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=استخدم مجلد الملف الشخصي لفايرف
 dataDir.selectDir=تحديد مجلد بيانات زوتيرو
 dataDir.selectedDirNonEmpty.title=المجلد غير فارغ
 dataDir.selectedDirNonEmpty.text=المجلد المحدد غير فارغ، ولا يبدو انه مجلد بيانات زوتيرو.\n\nهل ترغب بإنشاء ملفات زوتيرو في هذا الدليل؟
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=إخطار الترحيل لزوتيرو
 dataDir.standaloneMigration.description=يبدو أن هذه المرة الأولى التي تستخدم فيها %1$S. هل ترغب من %1$S باستيراد البيانات من %2$S واستخدام مجلد بياناتك الحالي؟
 dataDir.standaloneMigration.multipleProfiles=%1$S سوف يشارك مجلد زوتيرو بياناته مع مجلد الملف الشخصي الأكثر استخداما.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=بحث مخزن جديد
 pane.collections.savedSearchName=أدخل اسماً لهذا البحث المخزن:
 pane.collections.rename=إعادة تسمية مجموعة العناصر:
 pane.collections.library=مكتبتي
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=سلة المحذوفات
 pane.collections.untitled=بدون عنوان
 pane.collections.unfiled=العناصر الغير مصنفة
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=هل ترغب في حذف هذا الوسم؟\n\
 pane.tagSelector.numSelected.none=لايوجد أوسمة محددة
 pane.tagSelector.numSelected.singular=%S أوسمة محددة
 pane.tagSelector.numSelected.plural=%S وسم محدد
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=تحميل قائمة العناصر...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=نقل لسلة المحذوفات
 pane.items.trash=هل ترغب في نقل العنصر المحدد إلى سلة المحذوفات؟
 pane.items.trash.multiple=هل ترغب في نقل العناصر المحددة إلى سلة المحذوفات؟
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S عنصر محدد
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=تغيير نوع العنصر
 pane.item.changeType.text=هل ترغب في تغيير نوع العنصر؟\n\nستفقد الحقول التالية:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=لا توجد مرفقات:
 pane.item.attachments.count.singular=%S مرفقات:
 pane.item.attachments.count.plural=%S مرفق:
 pane.item.attachments.select=تحديد الملف
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=انقر هنا
-pane.item.tags=أوسمة:
 pane.item.tags.count.zero=لا توجد أوسمة:
 pane.item.tags.count.singular=%S أوسمة:
 pane.item.tags.count.plural=%S وسم:
 pane.item.tags.icon.user=الوسم المضاف من قبل المستخدم
 pane.item.tags.icon.automatic=الوسم المضاف تلقائياً
-pane.item.related=عناصر مرتبطة:
 pane.item.related.count.zero=لا توجد ارتباطات:
 pane.item.related.count.singular=%S ارتباطات:
 pane.item.related.count.plural=%S ارتباط:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=لا يمكن اضافة ملفات لمج
 ingester.saveToZotero=حفظ في زوتيرو
 ingester.saveToZoteroUsing=احفظ في زتوروه باستخدام تحت اسم "%S"
 ingester.scraping=حفظ العنصر...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=تم حفظ العنصر
 ingester.scrapeError=تعذر حفظ العنصر
 ingester.scrapeErrorDescription=حدث خطأ أثناء حفظ العنصر. قم بمراجعة %S لمزيد من المعلومات.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=السماح دائما لهذا المو
 
 ingester.importFile.title=استورد ملف
 ingester.importFile.text=هل تريد استيراد الملف "%S"?\n\nستضاف الخانات إلى مجموعة جديدة.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=تنفيذ البحث ...
 ingester.lookup.error=حدث خطأ أثناء تنفيذ البحث لهذا البند.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=لا توجد مقررات
 zotero.preferences.openurl.resolversFound.singular=توجد %S مقررات
 zotero.preferences.openurl.resolversFound.plural=يوجد %S مقرر
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=إعادة بناء الكشاف
 zotero.preferences.search.rebuildWarning=هل ترغب في إعادة بناء الكشاف كاملاً؟ قد يستغرق ذلك بعض الوقت.\n\n لتكشيف العناصر التي لم تكشف بعد، استخدم %S.
 zotero.preferences.search.clearIndex=مسح الكشاف
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=سيتم فقدان ا
 zotero.preferences.advanced.resetStyles=إعادة تعيين الأنماط
 zotero.preferences.advanced.resetStyles.changesLost=سيتم فقدان الأنماط المضافة أو المعدلة.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=لم يتم نسخ الملفات التالية لأنها موجودة بالفعل في المجلد الهدف:
 dragAndDrop.filesNotFound=لم يتم نسخ الملفات التالية لأنه لم يتم العثور عليها:
 
@@ -500,7 +559,8 @@ fileInterface.import=استيراد
 fileInterface.export=تصدير
 fileInterface.exportedItems=العناصر المصدَّرة
 fileInterface.imported=مستورد
-fileInterface.fileFormatUnsupported=تعذر إيجاد مترجمات للملف المطلوب.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=قائمة مراجع بدون عنوان
 fileInterface.bibliographyHTMLTitle=قائمة المراجع
 fileInterface.importError=حدث خطأ اثناء محاولة استيراد العنصر الذي اخترته. برجاء التأكد من صحة الملف ثم حاول مرة أخرى.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=العناصر التي اخترتها لا تح
 fileInterface.bibliographyGenerationError=حدث خطأ أثناء انتاج قائمة المراجع. الرجاء إعادة المحاولة.
 fileInterface.exportError=حدث خطأ أثناء محاولة تصدير الملف المحدد.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=وضع البحث المتقدم — اضغط مفتاح Enter للبحث.
 searchInProgress=جاري البحث — برجاء الانتظار.
 
@@ -613,6 +677,7 @@ integration.cited.loading=البحث عن عناصر استشهاد...
 integration.ibid=المرجع السابق
 integration.emptyCitationWarning.title=استشهاد فارغ
 integration.emptyCitationWarning.body=الاقتباس الذي قمت بتحديده سيكون فارغ في النمط المحدد حاليا. هل ترغب في إضافته؟
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=هذا الإصدار من وظائف زوتيرو الاضافية لمعالج النصوص ($INTEGRATION_VERSION) غير متوافق مع الإصدار المنصب حاليا من امتداد زوتيرو لمتصفح الفايرفوكس (%1$S). الرجاء التأكد من أنك تستخدم أحدث الإصدارات من المكونين.
 integration.error.incompatibleVersion2=يتطلب %1$S لزوتيرو %2$S %3$S أو الاحدث. الرجاء تحميل أحدث نسخة من %2$S من موقع zotero.org.
@@ -643,14 +708,22 @@ integration.citationChanged=قمت بتعديل هذا الاقتباس منذ 
 integration.citationChanged.description=بالنقر على "نعم" سيمنع Zotero من تحديث هذا الاقتباس إذا أضفت استشهادات إضافية، وأساليب تبديل، أو تعديل المرجع الذي يشير إليه. النقر على "لا" سيمحو التغييرات.
 integration.citationChanged.edit=قمت بتعديل هذا الاقتباس منذ أنشئه Zotero. التحرير سيمسح التعديلات. هل ترغب في الاستمرار؟
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=هل تريد تنصيب النمط "%1$S" من %2$S؟
 styles.updateStyle=هل تريد تحديث النمط الموجود"%1$S" مع "%2$S" من %3$S؟
 styles.installed=تم تنصيب نمط "%S" بنجاح..
 styles.installError=%S لا يبدو أنه ملف نمط صحيح.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S المراجع غير صالحة او ان ملف CSL غير موجود في %2$S كمصدر له.
 styles.deleteStyle=هل ترغب في حذف النمط "%1$S"؟
 styles.deleteStyles=هل ترغب في حذف النمط المحدد؟
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=إلغاء التزامن
 sync.openSyncPreferences=فتح تفضيلات التزامن...
 sync.resetGroupAndSync=إعادة تعيين مجموعات المشاركة و المزامنة
@@ -660,8 +733,10 @@ sync.remoteObject=كائن عن بعد
 sync.mergedObject=كائن مدمج
 
 sync.error.usernameNotSet=لم يتم تعيين اسم المستخدم
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=لم يتم تعيين كلمة المرور
 sync.error.invalidLogin=اسم المستخدم أو كلمة المرور غير صحيح
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=الرجاء إدخال كلمة المرور.
 sync.error.loginManagerCorrupted1=لم يتمكن زوتيرو من الوصول لمعلومات تسجيل الدخول لديك، وذلك على الارجح بسبب عطب في قاعدة بيانات ادارة تسجيل الدخول لمتصفح الفايرفوكس.
 sync.error.loginManagerCorrupted2=قم بإغلاق متصفح الفايرفوكس، قم بإجراء النسخ الاحتياطي وحذف تسجيلات الدخول.* من الملف الشخصي لمتصفح فايرفوكس الخاص بك, ثم قم بإعادة إدخال معلومات تسجيل الدخول لزوتيرو في تبويب التزامن بتفضيلات زوتيرو.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=إذا قمت بالمتابعة، سيتم إعاد
 sync.error.copyChangedItems=إذا كنت ترغب بنسخ التغييرات التي قمت بها في مكان آخر أو طلب حق الكتابة من مسؤول مجموعة المشاركة، قم بإلغاء التزامن الآن.
 sync.error.manualInterventionRequired=أسفرت المزامنة التلقائية عن تضارب الذي يتطلب التدخل اليدوي.
 sync.error.clickSyncIcon=اضغط على أيقونة التزامن للتزامن يدويا.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=لم تتم مزامنته بعد
 sync.status.lastSync=آخر تزامن:
@@ -682,9 +792,12 @@ sync.status.uploadingData=جاري رفع البيانات لخادم التزا
 sync.status.uploadAccepted=تم قبول الرفع \u2014 في انتظار خادم التزامن
 sync.status.syncingFiles=جاري مزامنة الملفات
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=تبقى %SKB
 sync.storage.filesRemaining=%1$S/%2$S ملف
 sync.storage.none=لا شيء
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=ملف محلي
 sync.storage.remoteFile=ملف عن بعد
 sync.storage.savedFile=ملف محفوظ
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=تم التحقق من تهيئة ال
 sync.storage.fileSyncSetUp=تم تجهيز مزامنة الملفات.
 sync.storage.openAccountSettings=فتح إعدادات الحساب
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=لا يمكن الوصول للخادم %S .
 sync.storage.error.permissionDeniedAtAddress=ليس لديك الصلاحية لإنشاء مجلد زوتيرو في المسار التالي:
 sync.storage.error.checkFileSyncSettings=الرجاء التحقق من إعدادات تزامن الملفات أو اتصل بمسؤول الخادم لديك.
 sync.storage.error.verificationFailed=فشل التحقق من %S . تحقق من إعدادات تزامن الملفات في تبويب التزامن بتفضيلات زوتيرو.
 sync.storage.error.fileNotCreated=لا يمكن إنشاء الملف '%S' في مجلد زوتيرو 'تخزين'.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=لم يعد لديك صلاحية تحرير الملف بمجموعة مشاركة زوتيرو '%S'، والملفات التي قمت بإضافتها أو تحريرها لا يمكن مزامنتها إلى الخادم.
 sync.storage.error.copyChangedItems=إذا كنت ترغب بنسخ العناصر والملفات المعدلة في مكان آخر، قم بإلغاء التزامن الآن.
 sync.storage.error.fileUploadFailed=فشلت عملية رفع الملف لعدم توافر المساحة الكافية على خادم WebDAV .
 sync.storage.error.directoryNotFound=المجلد غير موجود
 sync.storage.error.doesNotExist=%S غير موجود.
 sync.storage.error.createNow=هل تريد إنشاؤه الآن؟
-sync.storage.error.webdav.enterURL=برجاء ادخال موقع WebDAV.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S موقع WebDAV غير صالح.
 sync.storage.error.webdav.invalidLogin=لم يقبل خادم WebDAV اسم المستخدم وكلمة السر التي قمت بإدخالهما.
 sync.storage.error.webdav.permissionDenied=ليس لديك الصلاحية للوصول الى %S على خادم WebDAV.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=خطأ في اتصال SSL عند 
 sync.storage.error.webdav.loadURLForMoreInfo=لمزيد من المعلومات قم بزيارة موقع WebDAV.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=تحميل موقع WebDAV
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=لقد بلغت الحد الاقصى من حصتك في السعة التخزينية للملفات. لن يتم رفع بعض الملفات. ولكن سيتم مواصلة تزامن البيانات الاخرى لزوتيرو الى الخادم.
 sync.storage.error.zfs.personalQuotaReached2=للحصول على مساحة تخزين إضافية اطلع على إعدادات حسابك في موقع  zotero.org.
 sync.storage.error.zfs.groupQuotaReached1=لقد بلغت مجموعة المشاركة لزوتيرو '%S' الحد الاقصى من حصتك في السعة التخزينية للملفات. لن يتم رفع بعض الملفات. ولكن سيتم مواصلة تزامن البيانات الاخرى لزوتيرو الى الخادم.
 sync.storage.error.zfs.groupQuotaReached2=يستطيع مالك مجموعة المشاركة زيادة مساحتها التخزينية وذلك من خلال قسم الاعدادات بموقع zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=حفظ الوسم
 sync.longTagFixer.saveTags=حفظ الأوسمة
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=تعذر قراءة النص في ملف PDF.
 recognizePDF.noMatches=لم يتم العثور على مراجع مطابقة.
 recognizePDF.fileNotFound=لم يتم العثور على الملف.
 recognizePDF.limit=بلغ الاستعلام للحد الاقصى. حاول مجددا فيما بعد.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=تمت عملية استرجاع البيانات الوصفية.
 recognizePDF.close.label=إغلاق
 
@@ -753,8 +880,21 @@ rtfScan.rtf=تنسيق النص الغني (.rtf)
 rtfScan.saveTitle=حدد موقعا لحفظ الملف المصاغ
 rtfScan.scannedFileSuffix=(تم فحصه)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=فشل في تحديد موقع العنصر
 lookup.failure.description=لم يستطع زوتيرو العثور على التسجيلة الببليوجرافية للمعرف المحدد. برجاء التأكد من معرف العنصر وإعادة المحاولة مرة اخرى.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=العرض على الانترنت
 locate.online.tooltip=الذهاب لهذا العنصر على الانترنت
diff --git a/chrome/locale/bg-BG/zotero/about.dtd b/chrome/locale/bg-BG/zotero/about.dtd
index 29e17786d0..dfde62aa4a 100644
--- a/chrome/locale/bg-BG/zotero/about.dtd
+++ b/chrome/locale/bg-BG/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Специални благодарности:">
 <!ENTITY zotero.about.close "Затваряне">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/bg-BG/zotero/preferences.dtd b/chrome/locale/bg-BG/zotero/preferences.dtd
index 724d560281..7a77644e34 100644
--- a/chrome/locale/bg-BG/zotero/preferences.dtd
+++ b/chrome/locale/bg-BG/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "По подразбиране:">
 <!ENTITY zotero.preferences.items "записи">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Общи">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "Адрес:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Прекачените файлове в Моята Библиотека се синхронизират с">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Синхронизира прекачените файлове в груповите библиотеки с хранилището на Зотеро.">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Използвайки хранилището на Зотеро, Вие се съгласявате да бъдете обвързани с неговите">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "правила и условия">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Пълно синхронизиране със сървъра на Зотеро">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Обединява локалните дани на Зотеро с даните от сървъра, като игнорира историята на предходните синхронизации.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Възстановява Зотеро сървъра">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Изтрива всички дани от сървъра и ги замества с локалната информация.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Изтрива историята на предходните файлови синхронизации">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Принудителна проверка на хранилището за копията на всички локални файлове.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Възстановява...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Инсталира на допълнителни стилове...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Клавишни Комбинации">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Какъвто и да е низ">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Допълнителни">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Избор...">
 <!ENTITY zotero.preferences.dataDir.reveal "Показва папката с дани">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Подръжка на базата дани">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Проверка на цялостта на базата дани">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Възстановява преводачите и стиловете...">
diff --git a/chrome/locale/bg-BG/zotero/standalone.dtd b/chrome/locale/bg-BG/zotero/standalone.dtd
index f63a223052..e02c6a5a54 100644
--- a/chrome/locale/bg-BG/zotero/standalone.dtd
+++ b/chrome/locale/bg-BG/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/bg-BG/zotero/zotero.dtd b/chrome/locale/bg-BG/zotero/zotero.dtd
index daba3c34b9..b6a8b4558d 100644
--- a/chrome/locale/bg-BG/zotero/zotero.dtd
+++ b/chrome/locale/bg-BG/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Редактира">
 <!ENTITY zotero.general.delete "Изтрива">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Дневника с грешките може да съдържа съобщения несвързани с Зотеро.">
 <!ENTITY zotero.errorReport.submissionInProgress "Моля изчакайте докато бъде подаден отчета с грешките.">
 <!ENTITY zotero.errorReport.submitted "Отчета с грешките беше подаден.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Моля оставете съобщение във форумите на Zotero (forums.zotero.org) с идентификационият номер на отчета, описание на проблема и стъпките необходими, за да бъде възпроизведен.">
 <!ENTITY zotero.errorReport.notReviewed "В общият случай, отчетите с грешки няма да бъдат разглеждани, освен ако не са оповестени във форумите.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Инсталирахте нова версия на Зотеро.">
 <!ENTITY zotero.upgrade.upgradeRequired "Вашата база дани на Зотеро трябва да бъде осъвременена за да може да работи с новата версия.">
 <!ENTITY zotero.upgrade.autoBackup "Автоматично ще бъде направено копие на вашата база дани, преди да бъдат въвеждани каквито и да било промени.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Права">
 <!ENTITY zotero.items.dateAdded_column "Добавен на">
 <!ENTITY zotero.items.dateModified_column "Променен на">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Показва в библиотеката">
 <!ENTITY zotero.items.menu.attach.note "Добавя Бележка">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Преобразува текст">
 <!ENTITY zotero.item.textTransform.titlecase "Заглавни букви">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "New Note">
 <!ENTITY zotero.toolbar.note.standalone "Нова самостоятелна бележка">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Избор на видимите">
 <!ENTITY zotero.tagSelector.clearVisible "Отказ на видимите">
 <!ENTITY zotero.tagSelector.clearAll "Отказ на всички">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Преименува отметката...">
 <!ENTITY zotero.tagSelector.deleteTag "Изтрива отметка...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Въведете ISBN, DOI, или PMID за търсене в полето по-долу.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Избрани записи">
 <!ENTITY zotero.selectitems.intro.label "Изберете кои записи искате да добавите към Вашата библиотека">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Неотбелязаните отметки няма да бъдат съхранени.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Отметката ще бъде изтрита от всички записи.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Проксито е разпознато">
 <!ENTITY zotero.proxy.recognized.warning "Добавяйте само проксита свързани със страницата на вашата библиотека, училище или фирма">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Добавянето на други проксита може да позволи злонамерени интернет страници да се маскират като страници на които се доверявате.">
diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties
index d09dc24d59..33ba60ba33 100644
--- a/chrome/locale/bg-BG/zotero/zotero.properties
+++ b/chrome/locale/bg-BG/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Отлага рестартирането
 general.restartApp=Restart %S
 general.errorHasOccurred=Възникна грешка.
 general.unknownErrorOccurred=Възникна неизвестна грешка.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Моля рестартирайте Firefox.
 general.restartFirefoxAndTryAgain=Моля рестартирайте Firefox и опитайте отново.
 general.checkForUpdate=Проверка за осъвременена версия
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Виж %S за повече информация.
 general.enable=Включва
 general.disable=Изключва
 general.remove=Remove
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Операция на Зотеро е активна в момента.
 general.operationInProgress.waitUntilFinished=Моля изчакайте докато приключи.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Натиснете %S за да изпратите о
 errorReport.stepsToReproduce=Стъпки за възпроизвеждане:
 errorReport.expectedResult=Очакван резултат:
 errorReport.actualResult=Получен резултат:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Папката се даните на Зотеро не беше намерена.
 dataDir.previousDir=Предишна папка:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Използва на папката на Firefox проф
 dataDir.selectDir=Изберете папка за даните на Зотеро
 dataDir.selectedDirNonEmpty.title=Папката не е празна
 dataDir.selectedDirNonEmpty.text=Папката която избрахте не е празна и не изглежда като папка за дани на Зотеро.\n\nДа бъдат ли създадени файловете на Зотеро независимо от това?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Ново записано търсене
 pane.collections.savedSearchName=Въведете име за това записано търсене:
 pane.collections.rename=Преименува колекцията:
 pane.collections.library=Моята библиотека
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Кошче за боклук
 pane.collections.untitled=Без име
 pane.collections.unfiled=Unfiled Items
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Отметката ще бъде изтрита
 pane.tagSelector.numSelected.none=Избрани са 0 отметки
 pane.tagSelector.numSelected.singular=Избрана е %S отметка
 pane.tagSelector.numSelected.plural=Избрани са %S отметки
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Зарежда списъка на записите...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Премества в кошчето за боклук
 pane.items.trash=Сигурни ли сте, че искате да преместите избраният запис в кошчето за боклук?
 pane.items.trash.multiple=Сигурни ли сте, че искате да преместите избраните записи в кошчето за боклук?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=Избрани са %S записа
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Променя типа на записа
 pane.item.changeType.text=Сигурни ли сте, че искате да промените типа на записа?\n\nСледните полета ще бъдат загубени:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S приложения:
 pane.item.attachments.count.singular=%S приложение:
 pane.item.attachments.count.plural=%S приложения:
 pane.item.attachments.select=Избор на файл
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=натиснете тук
-pane.item.tags=Отметки:
 pane.item.tags.count.zero=%S отметки:
 pane.item.tags.count.singular=%S отметки:
 pane.item.tags.count.plural=%S отметки:
 pane.item.tags.icon.user=Отметки добавени от потребителя
 pane.item.tags.icon.automatic=Автоматично добавени отметки
-pane.item.related=Свързани:
 pane.item.related.count.zero=%S близки:
 pane.item.related.count.singular=%S близък:
 pane.item.related.count.plural=%S близки:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Съхранява в Зотеро
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=Съхранява записа...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Записа е съхранен.
 ingester.scrapeError=Записа не беше съхранен.
 ingester.scrapeErrorDescription=По време на записа на този запис възникна грешка. Моля опитайте отново. Ако тази грешка продължава да се появява, моля свържете се с автора на преводача.
@@ -427,7 +468,8 @@ ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=Намерени са %S решаващи сървъра.
 zotero.preferences.openurl.resolversFound.singular=Намерен е %S решаващ сървър.
 zotero.preferences.openurl.resolversFound.plural=Намерени са %S решаващи сървъра.
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Пресъздава индекс
 zotero.preferences.search.rebuildWarning=Желаете ли индекса да бъде пресъздаден? Това може да отнеме известно време.\n\nЗа индексиране само на записи които не са били индексирани преди, използвайте %S.
 zotero.preferences.search.clearIndex=Изчиства индекс
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Всички нови 
 zotero.preferences.advanced.resetStyles=Възстановява стиловете по подразбиране
 zotero.preferences.advanced.resetStyles.changesLost=Всички нови или модифицирани стилове ще бъдат загубени.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Папката вече съдържа следните файлове и те не бяха копирани.
 dragAndDrop.filesNotFound=Следните файлове не бяха намерени и не могат да бъдат копирани:
 
@@ -500,7 +559,8 @@ fileInterface.import=Внос
 fileInterface.export=Износ
 fileInterface.exportedItems=Изнесени записи
 fileInterface.imported=Внесени
-fileInterface.fileFormatUnsupported=Не бяха намерени преводачи за избрания файл.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Библиография без име
 fileInterface.bibliographyHTMLTitle=Библиография
 fileInterface.importError=Възникна грешка при опита за внос на избрания файл. Моля уверете се, че файла е валиден и опитайте отново.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Избраните записи не съдър
 fileInterface.bibliographyGenerationError=По време на създаването на библиографията възникна грешка. Моля опитайте отново.
 fileInterface.exportError=Възникна грешка при опита за износ на избрания файл.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Търсене за напреднали - натиснете Enter за да търсите.
 searchInProgress=Търсене - моля изчакайте.
 
@@ -613,6 +677,7 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Празен цитат
 integration.emptyCitationWarning.body=Цитатът който сте избрали ще бъден празен, след като се форматира според настоящият стил. Сигурни ли сте, че искате да го добавите?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Тази версия на плъгина за текстови редактори на Зотеро ($INTEGRATION_VERSION) не е съвместима с инсталираната понастоящем версия на Зотеро (%1$S). Моля убедете се, че използвате последните версии на двата компонента.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Да бъде ли инсталиран стила "%1$S" от %2$S?
 styles.updateStyle=Да бъде ли осъвременен съществуващия стил "%1$S" с "%2$S" от %3$S?
 styles.installed=Стилът "%S" беше успешно инсталиран.
 styles.installError=%S не е валиден стилов (CSL) файл.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S препраща към невалиден или несъщесвуваш CSL файл в %2$S, като негов източник.
 styles.deleteStyle=Сигурни ли сте че искате да изтриете стила "%1$S"?
 styles.deleteStyles=Сигурни ли сте че искате да изтриете избраните стилове?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Отказ на синхронизацията
 sync.openSyncPreferences=Отваря настройките за синхронизация...
 sync.resetGroupAndSync=Визстановява групата и синхронизация
@@ -660,8 +733,10 @@ sync.remoteObject=Делечен запис
 sync.mergedObject=Слят запис
 
 sync.error.usernameNotSet=Потребителското име не е въведено
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Паролата не е въведена
 sync.error.invalidLogin=Невалидно потребитлско име или парола
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Моля въведете парола
 sync.error.loginManagerCorrupted1=Зотеро няма достъп до информацията за вашият логин. Вероятно това се дължи на проблем в базата дани с логин информация на Firefox.
 sync.error.loginManagerCorrupted2=Затворете Firefox, копирайте и изтрийте записана логин информация* от вашият Firefox профил, след което въведете отново Вашият Зотеро логин в панела за синхронизация на настройките на Зотеро.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Ако продължите, вашето копие
 sync.error.copyChangedItems=Ако желаете да копирате вашите промени някъде другаде или да поискате достъп за писане от администратора на вашата група, откажете синхронизацията.
 sync.error.manualInterventionRequired=Възникна конфликт по време на автоматичната синхронизация, който изисква корекция на ръка.
 sync.error.clickSyncIcon=За ръчна синхронизация щракнете иконата за синхронизация.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Все още не е синхронизиран
 sync.status.lastSync=Последна синхронизация:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Качва дани в синхронизиращия
 sync.status.uploadAccepted=Качването на дани е прието - чака за синхронизиращ сървър
 sync.status.syncingFiles=Сихронизира файлове
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=Остават %SKB
 sync.storage.filesRemaining=%1$S/%2$S Файла
 sync.storage.none=Няма
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Локален файл
 sync.storage.remoteFile=Далечен файл
 sync.storage.savedFile=Съхранен файл
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Кофигурацията на сър
 sync.storage.fileSyncSetUp=Синхронизацията на файловете е настроена успешно.
 sync.storage.openAccountSettings=Отваря настройките на регистрацията
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Сървърът %S не беше достигнат.
 sync.storage.error.permissionDeniedAtAddress=Нямате разрешение за създаване на Зотеро директория на следният адрес:
 sync.storage.error.checkFileSyncSettings=Моля проверете настройките на файловата синхронизация или се свържете с администратора на сървъра.
 sync.storage.error.verificationFailed=%S проверкате беше неуспешна. Проверете параметрите на файловата синхронизация в панела за синхронизация в настройките на Зотеро.
 sync.storage.error.fileNotCreated=Файлът '%S' не може да бъде създаден в папката за съхранение нв Зотеро.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Вие нямате разрешение да редактирате файлове в Зотеро групата %S и файловете които сте добавили или редактирали не могат да бъдат синхронизирани със сървъра.
 sync.storage.error.copyChangedItems=Ако искате да копирате променените записи и файлове, откажете синхронизацията.
 sync.storage.error.fileUploadFailed=Файлът не беше качен.
 sync.storage.error.directoryNotFound=Папката не беше намерена
 sync.storage.error.doesNotExist=%S не съществува.
 sync.storage.error.createNow=Искате ли да го създадете сега?
-sync.storage.error.webdav.enterURL=Моля въведете WebDAV адрес.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S не е валиден WebDAV адрес.
 sync.storage.error.webdav.invalidLogin=WebDAV сървъра не приема потребителското име и паролата, които Вие въведохте.
 sync.storage.error.webdav.permissionDenied=Нямате разрешение за достъп до %S в WebDAV сървъра.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=Грешка в SSL връзкат
 sync.storage.error.webdav.loadURLForMoreInfo=Заредете WebDAV адреса в браузера за повече информация.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Вие достигнахте лимита на квотата за съхранение на файлове. Част от файловете не бяха качени. Останалите дани на Зотеро ще бъдат синхронизирани със сървъра.
 sync.storage.error.zfs.personalQuotaReached2=Вижте параметрите на вашият zotero.org акаунт за допълнителни опции за съхранение.
 sync.storage.error.zfs.groupQuotaReached1=Групата %S достигна лимита на квотата си за съхранение на файлове. Част от файловете не бяха качени. Останалите дани на Зотеро ще бъдат синхронизирани със сървъра.
 sync.storage.error.zfs.groupQuotaReached2=Собственика на групата може да да увеличи капацитета за съхранение от скецията с настройките за съхранение в zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Съхранява отметка
 sync.longTagFixer.saveTags=Съхранява отметките
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Текста на този PDF файл не може
 recognizePDF.noMatches=Не са открити съответстващи препратки.
 recognizePDF.fileNotFound=Файла не беше намерен.
 recognizePDF.limit=Достигнат е лимита на запитванията. Опитайте отново по-късно.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Изтеглянето на метаданите приключи.
 recognizePDF.close.label=Затваря
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Богат текстов формат (.rtf)
 rtfScan.saveTitle=Изберете къде да бъде записан форматираният файл
 rtfScan.scannedFileSuffix=(Сканиран)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Неуспешно търсене
 lookup.failure.description=Зотеро не може да намери запис за избраният идентификатор. Моля проверете идентификатора и опитайте отново.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/ca-AD/zotero/about.dtd b/chrome/locale/ca-AD/zotero/about.dtd
index b3335429b7..f9e5719a6d 100644
--- a/chrome/locale/ca-AD/zotero/about.dtd
+++ b/chrome/locale/ca-AD/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Agraïments especials:">
 <!ENTITY zotero.about.close "Tanca">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Més crèdits i reconeixements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/ca-AD/zotero/preferences.dtd b/chrome/locale/ca-AD/zotero/preferences.dtd
index d55f02e236..4af0e4d9c3 100644
--- a/chrome/locale/ca-AD/zotero/preferences.dtd
+++ b/chrome/locale/ca-AD/zotero/preferences.dtd
@@ -1,46 +1,47 @@
-<!ENTITY zotero.preferences.title "Preferències de Zotero">
+<!ENTITY zotero.preferences.title "Preferències del Zotero">
 
 <!ENTITY zotero.preferences.default "Per defecte:">
-<!ENTITY zotero.preferences.items "ítems">
+<!ENTITY zotero.preferences.items "elements">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "General">
 
-<!ENTITY zotero.preferences.userInterface "Interfície d&apos;usuari">
-<!ENTITY zotero.preferences.showIn "Carrega Zotero en:">
+<!ENTITY zotero.preferences.userInterface "Interfície de l'usuari">
+<!ENTITY zotero.preferences.showIn "Carrega el Zotero en:">
 <!ENTITY zotero.preferences.showIn.browserPane "Subfinestra del navegador">
 <!ENTITY zotero.preferences.showIn.separateTab "Pestanya separada">
 <!ENTITY zotero.preferences.showIn.appTab "Pestanya d'aplicacions">
 <!ENTITY zotero.preferences.statusBarIcon "Icona a la barra d&apos;estatus">
 <!ENTITY zotero.preferences.statusBarIcon.none "Cap">
-<!ENTITY zotero.preferences.fontSize "Mida de la font:">
+<!ENTITY zotero.preferences.fontSize "Mida de lletra:">
 <!ENTITY zotero.preferences.fontSize.small "Petita">
 <!ENTITY zotero.preferences.fontSize.medium "Mitjana">
 <!ENTITY zotero.preferences.fontSize.large "Gran">
-<!ENTITY zotero.preferences.fontSize.xlarge "X-gran">
-<!ENTITY zotero.preferences.fontSize.notes "Mida del tipus de lletra de la nota">
+<!ENTITY zotero.preferences.fontSize.xlarge "Molt gran">
+<!ENTITY zotero.preferences.fontSize.notes "Mida de lletra de la nota:">
 
-<!ENTITY zotero.preferences.miscellaneous "Miscel·lania">
-<!ENTITY zotero.preferences.autoUpdate "Automàticament cerca actualitzacions dels transcriptors">
+<!ENTITY zotero.preferences.miscellaneous "Miscel·lània">
+<!ENTITY zotero.preferences.autoUpdate "Cerca automàticament actualitzacions dels transcriptors">
 <!ENTITY zotero.preferences.updateNow "Actualitza ara">
 <!ENTITY zotero.preferences.reportTranslationFailure "Envia un informe dels transcriptors trencats">
-<!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Permeteu que zotero.org personalizi el contingut en base a la versió actual de Zotero">
-<!ENTITY zotero.preferences.zoteroDotOrgVersionHeader.tooltip "If enabled, the current Zotero version will be added to HTTP requests to zotero.org.">
-<!ENTITY zotero.preferences.parseRISRefer "utilitza Zotero per a arxius RIS/Refer descarregats">
-<!ENTITY zotero.preferences.automaticSnapshots "Automàticament crea una captura quan es creïn elements des de pàgines web">
-<!ENTITY zotero.preferences.downloadAssociatedFiles "Automàticament adjunta documents PDF associats i altres arxius quan es desin els elements">
-<!ENTITY zotero.preferences.automaticTags "Automàticament etiqueta els elements amb les capçaleres de paraules clau i tema">
-<!ENTITY zotero.preferences.trashAutoEmptyDaysPre "Elimina automàticament els ítems de la paperera suprimits fa més de">
+<!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Permeteu que zotero.org personalitzi el contingut en base a la versió actual del Zotero">
+<!ENTITY zotero.preferences.zoteroDotOrgVersionHeader.tooltip "Si està activat, la versió actual del Zotero s'afegirà a les petitcions HTTP per zotero.org.">
+<!ENTITY zotero.preferences.parseRISRefer "Fes servir el Zotero per als fitxers RIS/Refer descarregats">
+<!ENTITY zotero.preferences.automaticSnapshots "Crea automàticament una captura quan es creïn elements des de pàgines web">
+<!ENTITY zotero.preferences.downloadAssociatedFiles "Adjunta automàticament documents PDF associats i altres fitxers quan es desin els elements">
+<!ENTITY zotero.preferences.automaticTags "Etiqueta automàticament els elements amb les capçaleres de paraules clau i el tema">
+<!ENTITY zotero.preferences.trashAutoEmptyDaysPre "Elimina automàticament els elements de la paperera que s'han suprimit fa més de">
 <!ENTITY zotero.preferences.trashAutoEmptyDaysPost "dies">
 
 <!ENTITY zotero.preferences.groups "Grups">
-<!ENTITY zotero.preferences.groups.whenCopyingInclude "Quan copiï ítems entre les biblioteques, inclou:">
+<!ENTITY zotero.preferences.groups.whenCopyingInclude "Quan copiïs elements entre les biblioteques, inclou:">
 <!ENTITY zotero.preferences.groups.childNotes "notes descendents">
 <!ENTITY zotero.preferences.groups.childFiles "instantànies descendents i fitxers importats">
 <!ENTITY zotero.preferences.groups.childLinks "enllaços descendents">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "etiquetes">
 
-<!ENTITY zotero.preferences.openurl.caption "OpenURL">
+<!ENTITY zotero.preferences.openurl.caption "Obre la URL">
 
 <!ENTITY zotero.preferences.openurl.search "Cerca resolutors">
 <!ENTITY zotero.preferences.openurl.custom "Personalitzat...">
@@ -50,57 +51,63 @@
 <!ENTITY zotero.preferences.prefpane.sync "Sincronitza">
 <!ENTITY zotero.preferences.sync.username "Nom d'usuari">
 <!ENTITY zotero.preferences.sync.password "Contrasenya">
-<!ENTITY zotero.preferences.sync.syncServer "Servidor de sincronització de Zotero">
+<!ENTITY zotero.preferences.sync.syncServer "Servidor de sincronització del Zotero">
 <!ENTITY zotero.preferences.sync.createAccount "Crea un compte">
 <!ENTITY zotero.preferences.sync.lostPassword "Has oblidat la contrasenya?">
 <!ENTITY zotero.preferences.sync.syncAutomatically "Sincronitza automàticament">
-<!ENTITY zotero.preferences.sync.about "Al voltant de la sincronització">
+<!ENTITY zotero.preferences.sync.about "Quant a la sincronització">
 <!ENTITY zotero.preferences.sync.fileSyncing "Sincronització dels fitxers">
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
-<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Sincronitza els fitxers adjunts de La meva biblioteca mitjançant">
-<!ENTITY zotero.preferences.sync.fileSyncing.groups "Sincronitza els fitxers adjunts de les biblioteques de grup mitjançant l'enmagatzenatge de Zotero">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
-<!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Amb l'ús de l'emmagatzematge de Zotero, vostè accepta quedar obligat pels seus">
+<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Sincronitza els fitxers adjunts de la biblioteca mitjançant">
+<!ENTITY zotero.preferences.sync.fileSyncing.groups "Sincronitza els fitxers adjunts de les biblioteques de grup mitjançant l'emmagatzematge del Zotero">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
+<!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Amb l'ús de l'emmagatzematge del Zotero, accepteu quedar obligat pels">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "termes i condicions">
-<!ENTITY zotero.preferences.sync.reset.fullSync "Sincronització completa amb el Servidor de Zotero">
-<!ENTITY zotero.preferences.sync.reset.fullSync.desc "Fusionar les dades locals de Zotero amb dades del servidor de sincronització tot ignorant la història de sincronització.">
-<!ENTITY zotero.preferences.sync.reset.restoreFromServer "Restaura des del Servidor de Zotero">
-<!ENTITY zotero.preferences.sync.reset.restoreFromServer.desc "Elimina totes les dades locals de Zotero i restaura-les des del servidor de sincronització">
-<!ENTITY zotero.preferences.sync.reset.restoreToServer "Restaura al Servidor de Zotero">
-<!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Elimina totes les dades del servidor i sobreescriu-les amb les dades locals de Zotero.">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
+<!ENTITY zotero.preferences.sync.reset.fullSync "Sincronització completa amb el servidor del Zotero">
+<!ENTITY zotero.preferences.sync.reset.fullSync.desc "Fusiona les dades locals del Zotero amb les dades del servidor de sincronització i ignorant l'historial de sincronització.">
+<!ENTITY zotero.preferences.sync.reset.restoreFromServer "Restaura des del servidor del Zotero">
+<!ENTITY zotero.preferences.sync.reset.restoreFromServer.desc "Elimina totes les dades locals del Zotero i restaura-les des del servidor de sincronització">
+<!ENTITY zotero.preferences.sync.reset.restoreToServer "Restaura al servidor del Zotero">
+<!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Elimina totes les dades del servidor i sobreescriu-les amb les dades locals del Zotero.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Reinicia l'historial de sincronització dels fitxers">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Força la comprovació del servidor d'emmagatzematge per a tots els fitxers adjunts locals.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reinicia...">
 
 
 <!ENTITY zotero.preferences.prefpane.search "Cerca">
-<!ENTITY zotero.preferences.search.fulltextCache "Memòria cau de text-complet">
-<!ENTITY zotero.preferences.search.pdfIndexing "Indexat de PDF">
-<!ENTITY zotero.preferences.search.indexStats "Estadístiques d&apos;índex">
+<!ENTITY zotero.preferences.search.fulltextCache "Memòria cau de text complet">
+<!ENTITY zotero.preferences.search.pdfIndexing "Indexació dels PDF">
+<!ENTITY zotero.preferences.search.indexStats "Estadístiques de l'índex">
 
-<!ENTITY zotero.preferences.search.indexStats.indexed "Indexat:">
+<!ENTITY zotero.preferences.search.indexStats.indexed "Indexació:">
 <!ENTITY zotero.preferences.search.indexStats.partial "Parcialment:">
 <!ENTITY zotero.preferences.search.indexStats.unindexed "Sense indexar:">
 <!ENTITY zotero.preferences.search.indexStats.words "Paraules:">
 
-<!ENTITY zotero.preferences.fulltext.textMaxLength "Caràcters màxims indexats per arxiu:">
-<!ENTITY zotero.preferences.fulltext.pdfMaxPages "Pàgines màximes indexades per arxiu:">
+<!ENTITY zotero.preferences.fulltext.textMaxLength "Nombre màxim de caràcters indexats per fitxer:">
+<!ENTITY zotero.preferences.fulltext.pdfMaxPages "Nombe màxim de pàgines indexades per fitxer:">
 
 <!ENTITY zotero.preferences.prefpane.export "Exporta">
 
 <!ENTITY zotero.preferences.citationOptions.caption "Opcions de cita">
-<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Incloure URLs d&apos;articles en paper a les referències">
-<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "Quan aquesta opció està deshabilitada, Zotero inclou URLs quan es citen articles de premsa, revistes i revistes acadèmiques només si l&apos;article no té un ranc de pàgines assignat.">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Inclou les URL dels articles a les referències">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "Quan aquesta opció està deshabilitada, el Zotero inclou les URL quan se citen articles de premsa, revistes i revistes acadèmiques només si l'article no té un ran dge pàgines assignat.">
 
 <!ENTITY zotero.preferences.quickCopy.caption "Còpia ràpida">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Format de sortida per defecte:">
-<!ENTITY zotero.preferences.quickCopy.copyAsHTML "Copiar com a HTML">
+<!ENTITY zotero.preferences.quickCopy.copyAsHTML "Copia com a HTML">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Nota: el format de text enriquit es perdrà en Mac OS X">
-<!ENTITY zotero.preferences.quickCopy.siteEditor.setings "Configuració específica per a llos web:">
+<!ENTITY zotero.preferences.quickCopy.siteEditor.setings "Configuració específica per a llocs web:">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath "Domini/Ruta">
-<!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(p.ex. wikipedia.org)">
+<!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(per exemple, wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Format de sortida">
-<!ENTITY zotero.preferences.quickCopy.dragLimit "Desactiva la Còpia Ràpida en arrossegar més de">
+<!ENTITY zotero.preferences.quickCopy.dragLimit "Desactiva la còpia ràpida quan arrosseguis més de">
 
 <!ENTITY zotero.preferences.prefpane.cite "Cita">
 <!ENTITY zotero.preferences.cite.styles "Estils">
@@ -108,84 +115,92 @@
 <!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "Actualment no hi ha instal·lat cap connector.">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "Obtén connectors de processadors de textos">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation_for_zotero_2.1">
-<!ENTITY zotero.preferences.cite.wordProcessors.useClassicAddCitationDialog "Utilitza el diàleg clàssic Afegeix Cita">
+<!ENTITY zotero.preferences.cite.wordProcessors.useClassicAddCitationDialog "Utilitza el diàleg clàssic Afegeix cita">
 
 <!ENTITY zotero.preferences.cite.styles.styleManager "Gestor d'estils">
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Títol">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Actualitzat">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
-<!ENTITY zotero.preferences.export.getAdditionalStyles "Aconsegueix estils adicionals...">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Aconsegueix estils addicionals...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Dreceres de teclat">
 
-<!ENTITY zotero.preferences.keys.openZotero "Obre/Tanca Zotero">
+<!ENTITY zotero.preferences.keys.openZotero "Obre/Tanca el Zotero">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Canvia a pantalla completa">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "Enfoca la subfinestra de les biblioteques">
 <!ENTITY zotero.preferences.keys.quicksearch "Cerca ràpida">
-<!ENTITY zotero.preferences.keys.newItem "Crea un nou element">
+<!ENTITY zotero.preferences.keys.newItem "Crea un element nou">
 <!ENTITY zotero.preferences.keys.newNote "Crea una nova nota">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Canvia el selector d&apos;etiquetes">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copia les cites dels elements seleccionats al porta-retalls">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copia els elements seleccionats al porta-retalls">
 <!ENTITY zotero.preferences.keys.importFromClipboard "Importa des del porta-retalls">
-<!ENTITY zotero.preferences.keys.overrideGlobal "intenta corregir els conflictes n les dreceres de teclat">
-<!ENTITY zotero.preferences.keys.changesTakeEffect "Els canvis tenen efecte només en noves finestres">
+<!ENTITY zotero.preferences.keys.overrideGlobal "intenta corregir els conflictes en les dreceres de teclat">
+<!ENTITY zotero.preferences.keys.changesTakeEffect "Els canvis tenen efecte només en les finestres noves">
 
 <!ENTITY zotero.preferences.prefpane.proxies "Servidors intermediaris">
 
-<!ENTITY zotero.preferences.proxies.proxyOptions "Opcions dels servidor intermediari">
-<!ENTITY zotero.preferences.proxies.desc_before_link "Zotero redirigirà de manera transparent les peticions a través dels servidors intermediaris desats. Vegeu el">
+<!ENTITY zotero.preferences.proxies.proxyOptions "Opcions del servidor intermediari">
+<!ENTITY zotero.preferences.proxies.desc_before_link "El Zotero redirigirà de manera transparent les peticions a través dels servidors intermediaris desats. Vegeu ">
 <!ENTITY zotero.preferences.proxies.desc_link "Documentació del servidor intermediari">
-<!ENTITY zotero.preferences.proxies.desc_after_link "per obtenir més informació.">
-<!ENTITY zotero.preferences.proxies.transparent "Transparently redirect requests through previously used proxies">
+<!ENTITY zotero.preferences.proxies.desc_after_link "per a més informació.">
+<!ENTITY zotero.preferences.proxies.transparent "Habilita la redirecció del servidor intermediari">
 <!ENTITY zotero.preferences.proxies.autoRecognize "Reconeix automàticament els recursos dels servidors intermediaris">
-<!ENTITY zotero.preferences.proxies.disableByDomain "Desactivar la redirecció del servidor intermediari quan el meu nom de domini conté">
+<!ENTITY zotero.preferences.proxies.disableByDomain "Desactiva la redirecció del servidor intermediari quan el nom del domini contingui">
 <!ENTITY zotero.preferences.proxies.configured "Servidors intermediaris configurats">
 <!ENTITY zotero.preferences.proxies.hostname "Nom de l'amfitrió">
 <!ENTITY zotero.preferences.proxies.scheme "Combinació">
 
-<!ENTITY zotero.preferences.proxies.multiSite "Multi-lloc">
-<!ENTITY zotero.preferences.proxies.autoAssociate "Associa els nous amfitrions automàticament">
-<!ENTITY zotero.preferences.proxies.variables "Pots utilitzar les següents variables en la teva combinació de servidor intermediari:">
+<!ENTITY zotero.preferences.proxies.multiSite "Multilloc">
+<!ENTITY zotero.preferences.proxies.autoAssociate "Associa automàticament els amfitrions nous">
+<!ENTITY zotero.preferences.proxies.variables "Podeu fer servir les variables següents en la combinació del servidor intermediari:">
 <!ENTITY zotero.preferences.proxies.h_variable "&#37;h - El nom d'amfitrió del lloc del servidor intermediari (per exemple, www.zotero.org)">
-<!ENTITY zotero.preferences.proxies.p_variable "&#37;p - El camí de la pàgina del servidor intermediari sense la barra principal (p.ex., about/index.html)">
-<!ENTITY zotero.preferences.proxies.d_variable "&#37;d - El camí del directori (p.ex., about/)">
-<!ENTITY zotero.preferences.proxies.f_variable "&#37;f - El nom de fitxer (p.ex., index.html)">
+<!ENTITY zotero.preferences.proxies.p_variable "&#37;p - El camí de la pàgina del servidor intermediari sense la barra principal (per exemple, about/index.html)">
+<!ENTITY zotero.preferences.proxies.d_variable "&#37;d - El camí del directori (per exemple, about/)">
+<!ENTITY zotero.preferences.proxies.f_variable "&#37;f - El nom de fitxer (per exemple, index.html)">
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Qualsevol cadena">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avançat">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Localitza">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Gestor del motor de cerca d'articles">
 <!ENTITY zotero.preferences.locate.description "Descripció">
 <!ENTITY zotero.preferences.locate.name "Nom">
-<!ENTITY zotero.preferences.locate.locateEnginedescription "Un motor de cerca estén la capacitat del desplegable Localitzeu en el panell d'informació. En activar els Motors de Cerca a la llista a continuació s'afegiran a la llista desplegable i es podran utilitzar per localitzar els recursos de la vostra biblioteca al web.">
-<!ENTITY zotero.preferences.locate.addDescription "To add a Lookup Engine that is not on the list, visit the desired search engine in your browser and select 'Add' from the Firefox Search Bar. When you reopen this preference pane you will have the option to enable the new Lookup Engine.">
+<!ENTITY zotero.preferences.locate.locateEnginedescription "Un motor de cerca estén la capacitat del desplegable de localització en el panell d'informació. Quan habiliteu els motors de cerca a la llista, s'afegiran a la llista desplegable i es podran fer servir per localitzar els recursos de la vostra biblioteca al web.">
+<!ENTITY zotero.preferences.locate.addDescription "Per afegir un motor de cerca que no és a la llista, visiteu el motor de cerca que voleu amb el navegador i seleccioneu &#34;Add&#34; del menú de localització del Zotero.">
 <!ENTITY zotero.preferences.locate.restoreDefaults "Restaura els valors predeterminats">
 
 <!ENTITY zotero.preferences.charset "Codificació de caràcters">
 <!ENTITY zotero.preferences.charset.importCharset "Importa la codificació de caràcters">
 <!ENTITY zotero.preferences.charset.displayExportOption "Mostra l'opció de codificació de caràcters en l'exportació">
 
-<!ENTITY zotero.preferences.dataDir "Lloc d&apos;emmagatzematge">
+<!ENTITY zotero.preferences.dataDir "Lloc d'emmagatzematge">
 <!ENTITY zotero.preferences.dataDir.useProfile "Fer servir el directori del perfil del Firefox">
 <!ENTITY zotero.preferences.dataDir.custom "Personalitzat:">
-<!ENTITY zotero.preferences.dataDir.choose "Escull...">
+<!ENTITY zotero.preferences.dataDir.choose "Trieu...">
 <!ENTITY zotero.preferences.dataDir.reveal "Mostra el directori de dades">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Manteniment de la base de dades">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Comprova la integritat de la base de dades">
-<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reinicialitza traductors i estils...">
-<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reinicialitza traductors...">
-<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reinicialitza estils...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reinicialitza els traductors i els estils...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reinicialitza els traductors...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reinicialitza els estils...">
 
 <!ENTITY zotero.preferences.debugOutputLogging "Enregistrament del resultat de la depuració">
-<!ENTITY zotero.preferences.debugOutputLogging.message "El resultat de la depuració pot ajudar els desenvolupadors de Zotero a diagnosticar problemes en Zotero. L'enregistrament de la depuració alentirà Zotero pel que haurieu de deixar-la desactivada a menys que un desenvolupador de Zotero sol·liciti el resultat de la depuració.">
+<!ENTITY zotero.preferences.debugOutputLogging.message "El resultat de la depuració pot ajudar els desenvolupadors del Zotero a diagnosticar problemes. L'enregistrament de la depuració alentirà el Zotero, per això hauríeu de deixar-la deshabilitada si no és que un desenvolupador del Zotero us sol·licita el resultat de la depuració.">
 <!ENTITY zotero.preferences.debugOutputLogging.linesLogged "línies registrades">
 <!ENTITY zotero.preferences.debugOutputLogging.enableAfterRestart "Activa després de reiniciar">
-<!ENTITY zotero.preferences.debugOutputLogging.viewOutput "Veges el resultat de sortida">
+<!ENTITY zotero.preferences.debugOutputLogging.viewOutput "Visualitza el resultat de sortida">
 <!ENTITY zotero.preferences.debugOutputLogging.clearOutput "Neteja el resultat de sortida">
-<!ENTITY zotero.preferences.debugOutputLogging.submitToServer "Tramet al Servidor Zotero">
+<!ENTITY zotero.preferences.debugOutputLogging.submitToServer "Tramet al servidor del Zotero">
 
 <!ENTITY zotero.preferences.openAboutConfig "Obri about:config">
 <!ENTITY zotero.preferences.openCSLEdit "Obri l'editor CSL">
diff --git a/chrome/locale/ca-AD/zotero/searchbox.dtd b/chrome/locale/ca-AD/zotero/searchbox.dtd
index 5dc7d63608..6f04beb114 100644
--- a/chrome/locale/ca-AD/zotero/searchbox.dtd
+++ b/chrome/locale/ca-AD/zotero/searchbox.dtd
@@ -6,7 +6,7 @@
 <!ENTITY zotero.search.joinMode.suffix "de les següents:">
 
 <!ENTITY zotero.search.recursive.label "Cerca dins les subcarpetes">
-<!ENTITY zotero.search.noChildren "Mostra només ítems de nivell superior">
+<!ENTITY zotero.search.noChildren "Mostra només elements de nivell superior">
 <!ENTITY zotero.search.includeParentsAndChildren "Inclou pares i descendents dels elements coincidents">
 
 <!ENTITY zotero.search.textModes.phrase "Frase">
diff --git a/chrome/locale/ca-AD/zotero/standalone.dtd b/chrome/locale/ca-AD/zotero/standalone.dtd
index 5880626940..6068231331 100644
--- a/chrome/locale/ca-AD/zotero/standalone.dtd
+++ b/chrome/locale/ca-AD/zotero/standalone.dtd
@@ -1,12 +1,12 @@
-<!ENTITY preferencesCmdMac.label "Preferències">
+<!ENTITY preferencesCmdMac.label "Preferències...">
 <!ENTITY preferencesCmdMac.commandkey ",">
 <!ENTITY servicesMenuMac.label "Serveis">
 <!ENTITY hideThisAppCmdMac.label "Oculta &brandShortName;">
 <!ENTITY hideThisAppCmdMac.commandkey "H">
 <!ENTITY hideOtherAppsCmdMac.label "Oculta els altres">
 <!ENTITY hideOtherAppsCmdMac.commandkey "H">
-<!ENTITY showAllAppsCmdMac.label "Mostra tot">
-<!ENTITY quitApplicationCmdMac.label "Surt de Zotero">
+<!ENTITY showAllAppsCmdMac.label "Mostra-ho tot">
+<!ENTITY quitApplicationCmdMac.label "Surt del Zotero">
 <!ENTITY quitApplicationCmdMac.key "Q">
 
 
@@ -51,10 +51,10 @@
 <!ENTITY deleteCmd.label "Elimina">
 <!ENTITY deleteCmd.key "D">
 <!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Selecciona tot">
+<!ENTITY selectAllCmd.label "Selecciona-ho tot">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opcions">
+<!ENTITY preferencesCmd.label "Opcions...">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Preferències...">
 <!ENTITY preferencesCmdUnix.accesskey "n">
@@ -95,7 +95,7 @@
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Tramet comentaris">
 <!ENTITY helpFeedbackPage.accesskey "S">
-<!ENTITY helpReportErrors.label "Informa dels errors a Zotero">
+<!ENTITY helpReportErrors.label "Informa d'errors al Zotero">
 <!ENTITY helpReportErrors.accesskey "R">
 <!ENTITY helpCheckForUpdates.label "Comprova actualitzacions">
 <!ENTITY helpCheckForUpdates.accesskey "U">
diff --git a/chrome/locale/ca-AD/zotero/timeline.properties b/chrome/locale/ca-AD/zotero/timeline.properties
index 45f68ac593..8ab06698cc 100644
--- a/chrome/locale/ca-AD/zotero/timeline.properties
+++ b/chrome/locale/ca-AD/zotero/timeline.properties
@@ -1,4 +1,4 @@
-general.title=Línia del temps de Zotero
+general.title=Línia del temps del Zotero
 general.filter=Filtre:
 general.highlight=Realça:
 general.clearAll=Neteja-ho tot
diff --git a/chrome/locale/ca-AD/zotero/zotero.dtd b/chrome/locale/ca-AD/zotero/zotero.dtd
index 6f7c1ffd69..5d689162e9 100644
--- a/chrome/locale/ca-AD/zotero/zotero.dtd
+++ b/chrome/locale/ca-AD/zotero/zotero.dtd
@@ -5,30 +5,32 @@
 <!ENTITY zotero.general.edit "Edita">
 <!ENTITY zotero.general.delete "Suprimeix">
 
-<!ENTITY zotero.errorReport.unrelatedMessages "El registre d&apos;error pot incloure missatges no relacionats amb Zotero.">
-<!ENTITY zotero.errorReport.submissionInProgress "Si-us-plau espera mentre s&apos;envia l&apos;informe d&apos;error.">
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
+<!ENTITY zotero.errorReport.unrelatedMessages "El registre d&apos;error pot incloure missatges no relacionats amb el Zotero.">
+<!ENTITY zotero.errorReport.submissionInProgress "Espereu mentre s&apos;envia l&apos;informe d&apos;error.">
 <!ENTITY zotero.errorReport.submitted "L&apos;informe d&apos;error ha estat enviat correctament.">
 <!ENTITY zotero.errorReport.reportID "Número de referència de l&apos;informe:">
-<!ENTITY zotero.errorReport.postToForums "Si us plau, escriu un missatge al fòrum de Zotero (forums.zotero.org) amb aquest número de referència de l&apos;informe, una descripció del problema i qualsevol pas necessari per a reproduir-lo.">
-<!ENTITY zotero.errorReport.notReviewed "Els informes d&apos;error generalment no són revisats ni no es notifique al fòrum.">
+<!ENTITY zotero.errorReport.postToForums "Escriu un missatge al fòrum del Zotero (forums.zotero.org) amb aquest número de referència de l&apos;informe, una descripció del problema i qualsevol pas necessari per a reproduir-lo.">
+<!ENTITY zotero.errorReport.notReviewed "Els informes d&apos;error generalment no es revisen ni no es notifiquen al fòrum.">
 
-<!ENTITY zotero.upgrade.newVersionInstalled "Has instal·lat una nova versió de Zotero.">
-<!ENTITY zotero.upgrade.upgradeRequired "La teva base de dades s&apos;ha d&apos;actualitzar per a funcionar amb la nova versió.">
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
+<!ENTITY zotero.upgrade.newVersionInstalled "Has instal·lat una nova versió del Zotero.">
+<!ENTITY zotero.upgrade.upgradeRequired "La vostra base de dades s&apos;ha d&apos;actualitzar per a funcionar amb la nova versió.">
 <!ENTITY zotero.upgrade.autoBackup "Es farà una còpia de seguertat de la base de dades existent abans de fer cap canvi">
 <!ENTITY zotero.upgrade.majorUpgrade "Aquesta és una actualització principal.">
 <!ENTITY zotero.upgrade.majorUpgradeBeforeLink "Assegureu-vos de revisar">
 <!ENTITY zotero.upgrade.majorUpgradeLink "instruccions d'actualització">
 <!ENTITY zotero.upgrade.majorUpgradeAfterLink "abans de continuar.">
-<!ENTITY zotero.upgrade.upgradeInProgress "Si-us-plau espera que s&apos;acabi el procés d&apos;actualització. Pot trigar uns minuts.">
-<!ENTITY zotero.upgrade.upgradeSucceeded "La teva base de dades de Zotero s&apos;ha actualitzat correctament">
-<!ENTITY zotero.upgrade.changeLogBeforeLink "Si-us-plau mira">
-<!ENTITY zotero.upgrade.changeLogLink "el llistat de canvis">
+<!ENTITY zotero.upgrade.upgradeInProgress "Espereu que s&apos;acabi el procés d&apos;actualització. Pot trigar uns minuts.">
+<!ENTITY zotero.upgrade.upgradeSucceeded "La vostra base de dades del Zotero s&apos;ha actualitzat correctament">
+<!ENTITY zotero.upgrade.changeLogBeforeLink "Mireu">
+<!ENTITY zotero.upgrade.changeLogLink "la llista de canvis">
 <!ENTITY zotero.upgrade.changeLogAfterLink "per esbrinar les novetats">
 
-<!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.saveLinkAsItem "Desa l'enllaç com un ítem de Zotero">
-<!ENTITY zotero.contextMenu.saveImageAsItem "Desa l'imatge com un ítem de Zotero">
+<!ENTITY zotero.contextMenu.addTextToCurrentNote "Afegeix la selecció a una nota del Zotero">
+<!ENTITY zotero.contextMenu.addTextToNewNote "Crea un element del Zotero i una nota amb la selecció">
+<!ENTITY zotero.contextMenu.saveLinkAsItem "Desa l'enllaç com un element del Zotero">
+<!ENTITY zotero.contextMenu.saveImageAsItem "Desa la imatge com un element del Zotero">
 
 <!ENTITY zotero.tabs.info.label "Informació">
 <!ENTITY zotero.tabs.notes.label "Notes">
@@ -38,9 +40,9 @@
 <!ENTITY zotero.notes.separate "Edita en una finestra separada">
 
 <!ENTITY zotero.toolbar.duplicate.label "Mostra els duplicats">
-<!ENTITY zotero.collections.showUnfiledItems "Mostra els ítems no arxivats">
+<!ENTITY zotero.collections.showUnfiledItems "Mostra els elements no arxivats">
 
-<!ENTITY zotero.items.itemType "Tipus d'ítem">
+<!ENTITY zotero.items.itemType "Tipus d'element">
 <!ENTITY zotero.items.type_column "Tipus">
 <!ENTITY zotero.items.title_column "Títol">
 <!ENTITY zotero.items.creator_column "Creador">
@@ -50,37 +52,53 @@
 <!ENTITY zotero.items.publication_column "Publicació">
 <!ENTITY zotero.items.journalAbbr_column "Abreviatura de la revista">
 <!ENTITY zotero.items.language_column "Llengua">
-<!ENTITY zotero.items.accessDate_column "Accedit">
+<!ENTITY zotero.items.accessDate_column "Data d'accés">
 <!ENTITY zotero.items.libraryCatalog_column "Catàleg de la biblioteca">
-<!ENTITY zotero.items.callNumber_column "Codi de Catàleg">
+<!ENTITY zotero.items.callNumber_column "Codi del catàleg">
 <!ENTITY zotero.items.rights_column "Drets">
 <!ENTITY zotero.items.dateAdded_column "Data d&apos;incorporació">
 <!ENTITY zotero.items.dateModified_column "Data de modificació">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Mostra a la biblioteca">
-<!ENTITY zotero.items.menu.attach.note "Afegeix nota">
+<!ENTITY zotero.items.menu.attach.note "Afegeix una nota">
 <!ENTITY zotero.items.menu.attach "Afegeix un adjunt">
 <!ENTITY zotero.items.menu.attach.snapshot "Adjunta la captura de la pàgina actual">
-<!ENTITY zotero.items.menu.attach.link "Adjunta enllaç a la pàgina actual">
+<!ENTITY zotero.items.menu.attach.link "Adjunta un enllaç a la pàgina actual">
 <!ENTITY zotero.items.menu.attach.link.uri "Adjunta un enllaç a l'identificador uniforme de recursos...">
 <!ENTITY zotero.items.menu.attach.file "Adjunta la còpia emmagatzemada del fitxer...">
 <!ENTITY zotero.items.menu.attach.fileLink "Adjunta un enllaç al fitxer...">
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restaura a la biblioteca">
 <!ENTITY zotero.items.menu.duplicateItem "Duplica l&apos;element seleccionat">
-<!ENTITY zotero.items.menu.mergeItems "Combina els ítems...">
+<!ENTITY zotero.items.menu.mergeItems "Combina els elements...">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "Tria la versió de l'ítem com a ítem prinicpal:">
-<!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "Triaeu la versió de l'element com a element prinicpal:">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "Seleccioneu els camps que voleu mantenir de les altres versions de l'element:">
 
 <!ENTITY zotero.toolbar.newItem.label "Element nou">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Més">
-<!ENTITY zotero.toolbar.newItemFromPage.label "Crea un nou element a partir de la pàgina actual">
-<!ENTITY zotero.toolbar.lookup.label "Afegeix un ítem segons l'identificador">
+<!ENTITY zotero.toolbar.newItemFromPage.label "Crea un element nou a partir de la pàgina actual">
+<!ENTITY zotero.toolbar.lookup.label "Afegeix un element segons l'identificador">
 <!ENTITY zotero.toolbar.removeItem.label "Esborra l'element...">
-<!ENTITY zotero.toolbar.newCollection.label "Nova col·lecció...">
+<!ENTITY zotero.toolbar.newCollection.label "Col·lecció nova...">
 <!ENTITY zotero.toolbar.newGroup "Grup nou...">
-<!ENTITY zotero.toolbar.newSubcollection.label "Nova subcol·lecció...">
+<!ENTITY zotero.toolbar.newSubcollection.label "Subcol·lecció nova...">
 <!ENTITY zotero.toolbar.newSavedSearch.label "Nova cerca desada...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Buida la paperera">
 <!ENTITY zotero.toolbar.tagSelector.label "Mostra/Oculta el selector d&apos;etiquetes">
@@ -88,60 +106,69 @@
 <!ENTITY zotero.toolbar.import.label "Importa...">
 <!ENTITY zotero.toolbar.importFromClipboard "Importa del porta-retalls">
 <!ENTITY zotero.toolbar.export.label "Exporta la biblioteca...">
-<!ENTITY zotero.toolbar.rtfScan.label "RTF Scan...">
+<!ENTITY zotero.toolbar.rtfScan.label "Escaneig de l'RTF...">
 <!ENTITY zotero.toolbar.timeline.label "Crea línia del temps">
 <!ENTITY zotero.toolbar.preferences.label "Preferències...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Assistència i documentació">
-<!ENTITY zotero.toolbar.about.label "Sobre Zotero">
+<!ENTITY zotero.toolbar.about.label "Quant al Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Cerca avançada">
 <!ENTITY zotero.toolbar.tab.tooltip "Commuta el mode tabulació">
 <!ENTITY zotero.toolbar.openURL.label "Localitza">
-<!ENTITY zotero.toolbar.openURL.tooltip "Cerca&apos;l a la teva biblioteca local">
+<!ENTITY zotero.toolbar.openURL.tooltip "Cerqueu-lo a la biblioteca local">
 
 <!ENTITY zotero.item.add "Afegeix">
 <!ENTITY zotero.item.attachment.file.show "Mostra el fitxer">
 <!ENTITY zotero.item.textTransform "Transforma el text">
-<!ENTITY zotero.item.textTransform.titlecase "Tipus Frase">
-<!ENTITY zotero.item.textTransform.sentencecase "Majúscules o minúscules">
+<!ENTITY zotero.item.textTransform.titlecase "Majúscules o minúscules del títol">
+<!ENTITY zotero.item.textTransform.sentencecase "Majúscules o minúscules de la frase">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nota nova">
 <!ENTITY zotero.toolbar.note.standalone "Nova nota independent">
 <!ENTITY zotero.toolbar.note.child "Afegeix una nota descendent">
-<!ENTITY zotero.toolbar.lookup "Lookup by Identifier...">
+<!ENTITY zotero.toolbar.lookup "Cerca per l'identificador...">
 <!ENTITY zotero.toolbar.attachment.linked "Enllaç al fitxer...">
-<!ENTITY zotero.toolbar.attachment.add "Emmagatzema copia de l&apos;arxiu...">
+<!ENTITY zotero.toolbar.attachment.add "Emmagatzema una còpia del fitxer...">
 <!ENTITY zotero.toolbar.attachment.weblink "Desa l'enllaç a la pàgina actual">
 <!ENTITY zotero.toolbar.attachment.snapshot "Captura la pàgina actual">
 
 <!ENTITY zotero.tagSelector.noTagsToDisplay "No hi ha etiquetes per mostrar">
 <!ENTITY zotero.tagSelector.filter "Filtre:">
 <!ENTITY zotero.tagSelector.showAutomatic "Mostra automàtic">
-<!ENTITY zotero.tagSelector.displayAllInLibrary "Display all tags in this library">
+<!ENTITY zotero.tagSelector.displayAllInLibrary "Mostra totes les etiquetes a la biblioteca">
 <!ENTITY zotero.tagSelector.selectVisible "Selecciona les visibles">
 <!ENTITY zotero.tagSelector.clearVisible "Desselecciona les visibles">
 <!ENTITY zotero.tagSelector.clearAll "Desselecciona-ho tot">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Reanomena l'etiqueta...">
 <!ENTITY zotero.tagSelector.deleteTag "Esborra l'etiqueta...">
 
-<!ENTITY zotero.lookup.description "Introduïu l'ISBN, DOI, o PMID per cercar en el quadre tot seguit.">
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
+<!ENTITY zotero.lookup.description "Introduïu l'ISBN, DOI, o PMID per cercar en el quadre inferior.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Selecciona elements">
-<!ENTITY zotero.selectitems.intro.label "Selecciona els elements que vols afegir a la biblioteca">
+<!ENTITY zotero.selectitems.intro.label "Seleccioneu els elements que voleu afegir a la biblioteca">
 <!ENTITY zotero.selectitems.cancel.label "Cancel·la">
 <!ENTITY zotero.selectitems.select.label "D'acord">
 
 <!ENTITY zotero.bibliography.title "Crea cita / bibliografia">
-<!ENTITY zotero.bibliography.style.label "Estil de cites:">
-<!ENTITY zotero.bibliography.outputMode "Output Mode:">
+<!ENTITY zotero.bibliography.style.label "Estil de la cita:">
+<!ENTITY zotero.bibliography.outputMode "Mode de sortida:">
 <!ENTITY zotero.bibliography.bibliography "Bibliografia">
-<!ENTITY zotero.bibliography.outputMethod "Output Method:">
+<!ENTITY zotero.bibliography.outputMethod "Mètode de sortida:">
 <!ENTITY zotero.bibliography.saveAsRTF.label "Desa com a RTF">
 <!ENTITY zotero.bibliography.saveAsHTML.label "Desa com a HTML">
 <!ENTITY zotero.bibliography.copyToClipboard.label "Desa al porta-retalls">
 <!ENTITY zotero.bibliography.print.label "Imprimeix">
 
 <!ENTITY zotero.integration.docPrefs.title "Preferències del document">
-<!ENTITY zotero.integration.addEditCitation.title "Afegeix / Edita cita">
+<!ENTITY zotero.integration.addEditCitation.title "Afegeix / Edita la cita">
 <!ENTITY zotero.integration.editBibliography.title "Edita la bibliografia">
 <!ENTITY zotero.integration.quickFormatDialog.title "Cita de format ràpid">
 
@@ -167,10 +194,10 @@
 <!ENTITY zotero.richText.italic.label "Cursiva">
 <!ENTITY zotero.richText.bold.label "Negreta">
 <!ENTITY zotero.richText.underline.label "Subratllat">
-<!ENTITY zotero.richText.superscript.label "superíndex">
-<!ENTITY zotero.richText.subscript.label "subíndex">
+<!ENTITY zotero.richText.superscript.label "Superíndex">
+<!ENTITY zotero.richText.subscript.label "Subíndex">
 
-<!ENTITY zotero.annotate.toolbar.add.label "Afegeix anotació">
+<!ENTITY zotero.annotate.toolbar.add.label "Afegeix una anotació">
 <!ENTITY zotero.annotate.toolbar.collapse.label "Col·lapsa totes les anotacions">
 <!ENTITY zotero.annotate.toolbar.expand.label "Expandeix totes les anotacions">
 <!ENTITY zotero.annotate.toolbar.highlight.label "Marca el text">
@@ -178,73 +205,77 @@
 
 <!ENTITY zotero.integration.prefs.displayAs.label "Mostra les cites com a:">
 <!ENTITY zotero.integration.prefs.footnotes.label "Notes al peu">
-<!ENTITY zotero.integration.prefs.endnotes.label "Notes finals">
+<!ENTITY zotero.integration.prefs.endnotes.label "Notes al final">
 
 <!ENTITY zotero.integration.prefs.formatUsing.label "Format utilitzat:">
 <!ENTITY zotero.integration.prefs.bookmarks.label "Adreces d&apos;interès">
-<!ENTITY zotero.integration.prefs.bookmarks.caption "Les adreces d&apos;interès es conserven entre Microsoft Word i OpenOffice però poden veure&apos;s accidentalment modificades.">
+<!ENTITY zotero.integration.prefs.bookmarks.caption "Les adreces d&apos;interès es conserven entre el Microsoft Word i l'OpenOffice però es poden veure modificades accidentalment.">
 
 <!ENTITY zotero.integration.prefs.storeReferences.label "Emmagatzema les referències al document">
-<!ENTITY zotero.integration.prefs.storeReferences.caption "L'emmagatzematge de les referències en el document augmenta lleugerament la mida del fitxer, però li permet compartir el seu document amb altres persones sense necessitat d'utilitzar un grup de Zotero. Per actualitzar els documents creats amb aquesta opció és necessari Zotero 3.0 o versions posteriors.">
+<!ENTITY zotero.integration.prefs.storeReferences.caption "L'emmagatzematge de les referències en el document augmenta lleugerament la mida del fitxer, però us permet compartir el document amb altres persones sense necessitat de fer servir un grup del Zotero. Per actualitzar els documents creats amb aquesta opció cal tenir la versió Zotero 3.0 o versions posteriors.">
 
 <!ENTITY zotero.integration.showEditor.label "Mostra l'editor">
 <!ENTITY zotero.integration.classicView.label "Vista clàssica">
 
 <!ENTITY zotero.integration.references.label "Referències a la bibliografia">
 
-<!ENTITY zotero.sync.button "Sincronitza amb el Servidor de Zotero">
+<!ENTITY zotero.sync.button "Sincronitza amb el servidor del Zotero">
 <!ENTITY zotero.sync.error "Error de sincronització">
 <!ENTITY zotero.sync.storage.progress "Progrés:">
 <!ENTITY zotero.sync.storage.downloads "Descàrregues:">
 <!ENTITY zotero.sync.storage.uploads "Càrregues">
 
-<!ENTITY zotero.sync.longTagFixer.followingTagTooLong "La següent etiqueta de la seva biblioteca Zotero és massa llarga perquè es sincronitzi amb el servidor:">
-<!ENTITY zotero.sync.longTagFixer.syncedTagSizeLimit "Les etiquetes sincronitzades ha d'ésser inferiors a 256 caràcters.">
-<!ENTITY zotero.sync.longTagFixer.splitEditDelete "Pot dividir l'etiqueta en vàries etiquetes, editar-la manualment per reduir la seva longitud, o suprimir-la.">
+<!ENTITY zotero.sync.longTagFixer.followingTagTooLong "L'etiqueta següent de la biblioteca Zotero és massa llarga perquè se sincronitzi amb el servidor:">
+<!ENTITY zotero.sync.longTagFixer.syncedTagSizeLimit "Les etiquetes sincronitzades ha de tenir menys de 256 caràcters.">
+<!ENTITY zotero.sync.longTagFixer.splitEditDelete "Podeu dividir l'etiqueta en diverses etiquetes, editar-la manualment per reduir-ne la longitud, o suprimir-la.">
 <!ENTITY zotero.sync.longTagFixer.split "Divideix">
 <!ENTITY zotero.sync.longTagFixer.splitAtThe "Divideix en el">
 <!ENTITY zotero.sync.longTagFixer.character "caràcter">
 <!ENTITY zotero.sync.longTagFixer.characters "caràcters">
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Les etiquetes desactivades no es desaran.">
-<!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "L'etiqueta es suprimirà de tots els ítems.">
+<!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "L'etiqueta se suprimirà de tots els elements.">
+
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
 
 <!ENTITY zotero.proxy.recognized.title "Servidor intermediari reconegut">
 <!ENTITY zotero.proxy.recognized.warning "Afegiu tan sols servidors intermediaris enllaçats des del lloc web de la vostra biblioteca, escola o corporació">
-<!ENTITY zotero.proxy.recognized.warning.secondary "L'addició d'altres servidors intermediaris permet als llocs maliciosos fer-se passar pels llocs de confiança.">
-<!ENTITY zotero.proxy.recognized.disable.label "No redirigeixis automàticament les peticions a través de servidors intermediaris prèviament reconeguts">
+<!ENTITY zotero.proxy.recognized.warning.secondary "L'addició d'altres servidors intermediaris permet als llocs maliciosos fer-se passar per llocs de confiança.">
+<!ENTITY zotero.proxy.recognized.disable.label "No redirigeixis automàticament les peticions a través de servidors intermediaris reconeguts prèviament ">
 <!ENTITY zotero.proxy.recognized.ignore.label "Ignora">
 
-<!ENTITY zotero.recognizePDF.recognizing.label "Retrieving Metadata...">
+<!ENTITY zotero.recognizePDF.recognizing.label "S'estan recuperant les metadades...">
 <!ENTITY zotero.recognizePDF.cancel.label "Cancel·la">
-<!ENTITY zotero.recognizePDF.pdfName.label "Nom PDF">
-<!ENTITY zotero.recognizePDF.itemName.label "Nom de l'ítem">
+<!ENTITY zotero.recognizePDF.pdfName.label "Nom del PDF">
+<!ENTITY zotero.recognizePDF.itemName.label "Nom de l'element">
 <!ENTITY zotero.recognizePDF.captcha.label "Escriviu el text de sota per continuar la recuperació de les metadades.">
 
-<!ENTITY zotero.rtfScan.title "Escaneig de RTF">
+<!ENTITY zotero.rtfScan.title "Escaneig de l'RTF">
 <!ENTITY zotero.rtfScan.cancel.label "Cancel·la">
 <!ENTITY zotero.rtfScan.citation.label "Cita">
-<!ENTITY zotero.rtfScan.itemName.label "Nom de l'ítem">
+<!ENTITY zotero.rtfScan.itemName.label "Nom de l'element">
 <!ENTITY zotero.rtfScan.unmappedCitations.label "Cites desassociades">
 <!ENTITY zotero.rtfScan.ambiguousCitations.label "Cites  ambigües">
-<!ENTITY zotero.rtfScan.mappedCitations.label "Cites sassociades">
+<!ENTITY zotero.rtfScan.mappedCitations.label "Cites associades">
 <!ENTITY zotero.rtfScan.introPage.label "Introducció">
-<!ENTITY zotero.rtfScan.introPage.description "Zotero can automatically extract and reformat citations and insert a bibliography into RTF files. To get started, choose an RTF file below.">
-<!ENTITY zotero.rtfScan.introPage.description2 "Per començar, seleccioneu un fitxer d'entrada RTF i un arxiu de sortida tot seguit:">
+<!ENTITY zotero.rtfScan.introPage.description "El Zotero pot recuperar i reformatar les cites i inserir una bibliografia als fitxers RTF. La funció d'escaneig dels fitxers RTF actualment permet les cites amb les variacions de format següents: ">
+<!ENTITY zotero.rtfScan.introPage.description2 "Per començar, seleccioneu un fitxer d'entrada RTF i un fitxer de sortida:">
 <!ENTITY zotero.rtfScan.scanPage.label "Escanejant en cerca de cites">
-<!ENTITY zotero.rtfScan.scanPage.description "Zotero es troba escanejant el document cercant-hi cites. Si us plau, sigui pacient.">
-<!ENTITY zotero.rtfScan.citationsPage.label "Verifica els ítems citats">
-<!ENTITY zotero.rtfScan.citationsPage.description "Reviseu la llista de cites reconegudes tot seguit per assegurar-se que Zotero ha seleccionat correctament els ítems corresponents. Totes les cites desassociades o ambigües han de ser resoltes abans de procedir al següent pas.">
+<!ENTITY zotero.rtfScan.scanPage.description "El Zotero està escanejant el document cercant-hi cites. Tingueu pacipència.">
+<!ENTITY zotero.rtfScan.citationsPage.label "Verifica els elements citats">
+<!ENTITY zotero.rtfScan.citationsPage.description "Reviseu la llista de cites reconegudes següent per assegurar-vos que el Zotero ha seleccionat correctament els elements corresponents. Totes les cites desassociades o ambigües s'han de resoldre abans d'anar al següent pas.">
 <!ENTITY zotero.rtfScan.stylePage.label "Formatació del document">
 <!ENTITY zotero.rtfScan.formatPage.label "Formatant les cites">
-<!ENTITY zotero.rtfScan.formatPage.description "Zotero es troba processant i formatant el seu fitxer RTF. Si us plau, sigui pacient.">
-<!ENTITY zotero.rtfScan.completePage.label "Escaneig RFT completat">
-<!ENTITY zotero.rtfScan.completePage.description "El document ja s'ha analitzat i processat. Si us plau, comproveu que és formatat correctament.">
+<!ENTITY zotero.rtfScan.formatPage.description "El Zotero està processant i formatant el fitxer RTF. Tingueu paciència.">
+<!ENTITY zotero.rtfScan.completePage.label "Escaneig de l'RFT completat">
+<!ENTITY zotero.rtfScan.completePage.description "El document ja s'ha analitzat i processat. Comproveu que s'ha formatat correctament.">
 <!ENTITY zotero.rtfScan.inputFile.label "Fitxer d'entrada">
 <!ENTITY zotero.rtfScan.outputFile.label "Fitxer de sortida">
 
-<!ENTITY zotero.file.choose.label "Tria un fitxer...">
-<!ENTITY zotero.file.noneSelected.label "No s'ha seleccionat cap fitxer">
+<!ENTITY zotero.file.choose.label "Trieu un fitxer...">
+<!ENTITY zotero.file.noneSelected.label "No heu seleccionat cap fitxer">
 
-<!ENTITY zotero.downloadManager.label "Desa a Zotero">
-<!ENTITY zotero.downloadManager.saveToLibrary.description "Els adjunts no es poden desar a la biblioteca seleccionada. En comptes, aquest ítem es desarà a la seva biblioteca.">
-<!ENTITY zotero.downloadManager.noPDFTools.description "Per utilitzar aquesta funció, primer cal instal·lar les eines de PDF en les preferències de Zotero.">
+<!ENTITY zotero.downloadManager.label "Desa al Zotero">
+<!ENTITY zotero.downloadManager.saveToLibrary.description "Els adjunts no es poden desar a la biblioteca seleccionada. Aquest element es desarà a la biblioteca.">
+<!ENTITY zotero.downloadManager.noPDFTools.description "Per utilitzar aquesta funció, primer cal instal·lar les eines de PDF en les preferències del Zotero.">
diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties
index 5b3a3070cb..84c3132aa4 100644
--- a/chrome/locale/ca-AD/zotero/zotero.properties
+++ b/chrome/locale/ca-AD/zotero/zotero.properties
@@ -1,30 +1,33 @@
-extensions.zotero@chnm.gmu.edu.description=L'eina de recerca de la següent generació
+extensions.zotero@chnm.gmu.edu.description=L'eina de recerca de la generació següent
 
 general.success=Amb èxit
 general.error=Error
 general.warning=Advertència
 general.dontShowWarningAgain=No mostris més aquesta advertència.
-general.browserIsOffline=%S es troba actualment treballant fora de línia
+general.browserIsOffline=%S actualment treballa fora de línia
 general.locate=Localitza...
-general.restartRequired=Es requereix reiniciar
+general.restartRequired=Cal reiniciar
 general.restartRequiredForChange=S'ha de reiniciar el %S per tal que el canvi faci efecte
 general.restartRequiredForChanges=S'ha de reiniciar el %S per tal que els canvis facin efecte
 general.restartNow=Reinicia ara
 general.restartLater=Reinicia més tard
-general.restartApp=Restart %S
+general.restartApp=Reinicia %S
 general.errorHasOccurred=S'ha produït un error
 general.unknownErrorOccurred=S'ha produït un error desconegut.
-general.restartFirefox=Si-us-plau reinicia el Firefox.
-general.restartFirefoxAndTryAgain=Si-us-plau reinicia el Firefox i torna-ho a provar
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
+general.restartFirefox=Reinicieu el Firefox.
+general.restartFirefoxAndTryAgain=Reinicieu el Firefox i torneu-ho a provar
 general.checkForUpdate=Comprova si hi ha actualitzacions
 general.actionCannotBeUndone=Aquesta acció no es pot desfer.
 general.install=Instal·la
 general.updateAvailable=Actualització disponible
 general.upgrade=Actualitza
-general.yes=Si
+general.yes=Sí
 general.no=No
 general.passed=Passat
-general.failed=Fallat
+general.failed=Ha fallat
 general.and=i
 general.accessDenied=Accés denegat
 general.permissionDenied=Permís denegat
@@ -32,14 +35,18 @@ general.character.singular=caràcter
 general.character.plural=caràcters
 general.create=Crea
 general.seeForMoreInformation=Mira %S per a més informació.
-general.enable=Activa
-general.disable=Desactiva
+general.enable=Habilita
+general.disable=Deshabilita
 general.remove=Elimina
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Obre la documentació
-general.numMore=%S more…
+general.numMore=%S més...
+general.openPreferences=Open Preferences
 
-general.operationInProgress=Una operació de Zotero està actualment en curs.
-general.operationInProgress.waitUntilFinished=Si us plau, espereu fins que hagi acabat.
+general.operationInProgress=Una operació del Zotero està actualment en curs.
+general.operationInProgress.waitUntilFinished=Espereu fins que hagi acabat.
 general.operationInProgress.waitUntilFinishedAndTryAgain=Si us plau, espereu fins que hagi acabat i torneu a intentar.
 
 punctuation.openingQMark="
@@ -47,34 +54,54 @@ punctuation.closingQMark="
 punctuation.colon=:
 
 install.quickStartGuide=Guia d'inici ràpid
-install.quickStartGuide.message.welcome=Benvingut a Zotero
+install.quickStartGuide.message.welcome=Us donem la benvinguda al Zotero
 install.quickStartGuide.message.view=Llegiu la Guia d'inici ràpid per a saber com començar a recollir, gestionar, citar i compartir les vostres fonts d'investigació.
 install.quickStartGuide.message.thanks=Gràcies per instal·lar Zotero.
 
 upgrade.failed.title=No s'ha pogut actualitzar
-upgrade.failed=L'actualització de la base de dades de Zotero ha fallat:
-upgrade.advanceMessage=Prem %S per a actualitzar ara.
-upgrade.dbUpdateRequired=La base de dades de Zotero s'ha d'actualitzar.
-upgrade.integrityCheckFailed=La teva base de dades de Zotero ha de ser reparada abans de continuar amb l'actualització.
-upgrade.loadDBRepairTool=Carrega l'Eina de reparació de bases de dades
-upgrade.couldNotMigrate=Zotero could not migrate all necessary files.\nPlease close any open attachment files and restart %S to try the upgrade again.
-upgrade.couldNotMigrate.restart=Si continues rebent aquest missatge, reinicia l'equip.
+upgrade.failed=L'actualització de la base de dades del Zotero ha fallat:
+upgrade.advanceMessage=Premu %S per a actualitzar ara.
+upgrade.dbUpdateRequired=La base de dades del Zotero s'ha d'actualitzar.
+upgrade.integrityCheckFailed=La vostra base de dades del Zotero s'ha de reparada abans de continuar amb l'actualització.
+upgrade.loadDBRepairTool=Carrega l'Eina de reparació de la bases de dades
+upgrade.couldNotMigrate=El Zotero no pot moure tots els fitxers necessaris.\nTanqueu tots els fitxers adjunts que estiguin oberts i reinicieu el Firefox per tornar a intentar l'actualització.
+upgrade.couldNotMigrate.restart=Si continueu rebent aquest missatge, reinicieu l'ordinador.
 
-errorReport.reportError=Report Error...
+errorReport.reportError=Notifica un error...
 errorReport.reportErrors=Notifica errors...
-errorReport.reportInstructions=Pots notificar aquest error seleccionat "%S" des del menú Accions (engranatge)
-errorReport.followingErrors=Els següents errors han ocorregut des de l'inici de %S:
-errorReport.advanceMessage=Prem %S per enviar un informe d'error als desenvolupadors de Zotero
+errorReport.reportInstructions=Podeu notificar aquest error seleccionat "%S" des del menú Accions (engranatge)
+errorReport.followingErrors=Els errors següents han ocorregut des de l'inici de %S:
+errorReport.advanceMessage=Premeu %S per enviar un informe d'error als desenvolupadors del Zotero
 errorReport.stepsToReproduce=Passos per a reproduir-lo:
 errorReport.expectedResult=Resultat esperat:
 errorReport.actualResult=Resultat real:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
 
-dataDir.notFound=No es pot trobar el directori de dades de Zotero
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
+
+dataDir.notFound=No es pot trobar el directori de dades del Zotero
 dataDir.previousDir=Directori anterior:
 dataDir.useProfileDir=Utilitza el directori del perfil del Firefox
-dataDir.selectDir=Selecciona directori de dates per a Zotero
+dataDir.selectDir=Selecciona el directori de dades per al Zotero
 dataDir.selectedDirNonEmpty.title=El directori no està buit
-dataDir.selectedDirNonEmpty.text=El directori que has seleccionat no està buit i no sembla que sigui un directori de dades de Zotero.\n\n Vols crear arxius de Zotero en aquest directori de totes maneres?
+dataDir.selectedDirNonEmpty.text=El directori que has seleccionat no està buit i no sembla que sigui un directori de dades del Zotero.\n\n Vols crear arxius de Zotero en aquest directori de totes maneres?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=S'ha trobat una Biblioteca de Zotero
 dataDir.standaloneMigration.description=Sembla ser la teva primera vegada utilitzant %1$S. T'agradaria que %1$S importés la configuració de %2$S i fes ús del teu directori de dades?
 dataDir.standaloneMigration.multipleProfiles=%1$S compartirà el seu directori de dades amb el perfil utilitzat més recentment.
@@ -85,10 +112,10 @@ app.firefox=Zotero per Firefox
 
 startupError=Hi ha hagut un error en iniciar Zotero.
 startupError.databaseInUse=La teva base de dades de Zotero està actualment en ús. En aquest moment i simultàniament només pot estar oberta una instància de Zotero amb la mateixa base de dades.
-startupError.closeStandalone=Si Zotero Independent és obert, tanqueu-lo i reinicieu Firefox.
+startupError.closeStandalone=Si el Zotero Independent és obert, tanqueu-lo i reinicieu Firefox.
 startupError.closeFirefox=Si Firefox amb l'extensió Zotero és obert, tanqueu i reinicieu Zotero Independent.
 startupError.databaseCannotBeOpened=La base de dades de Zotero no es pot obrir.
-startupError.checkPermissions=Make sure you have read and write permissions to all files in the Zotero data directory.
+startupError.checkPermissions=Assegure-vos que heu llegit els permisos per a tots els fitxers al directori de dades del Zotero.
 startupError.zoteroVersionIsOlder=Aquesta versió de Zotero és més vella que la darrera versió què s'utilitzà amb la teva base de dades.
 startupError.zoteroVersionIsOlder.upgrade=Si us plau, actualitzeu a la darrera versió de zotero.org.
 startupError.zoteroVersionIsOlder.current=Versió actual: %S
@@ -105,19 +132,20 @@ date.relative.daysAgo.multiple=Fa %S dies
 date.relative.yearsAgo.one=Fa 1 any
 date.relative.yearsAgo.multiple=Fa %S anys
 
-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?
-pane.collections.emptyTrash=Segur que vols eliminar permanentment els ítems de la Paperera?
+pane.collections.delete=Segur que voleu eliminar la col·lecció seleccionada?
+pane.collections.deleteSearch=Segur que voleu eliminar la cerca seleccionada?
+pane.collections.emptyTrash=Segur que vols eliminar permanentment els elements de la paperera?
 pane.collections.newCollection=Nova col·lecció
 pane.collections.name=Nom de la col·lecció:
 pane.collections.newSavedSeach=Nova cerca desada
 pane.collections.savedSearchName=Entra un mom per aquesta cerca desada
 pane.collections.rename=Canvia el nom de la col·lecció:
 pane.collections.library=La meva llibreria
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Paperera
 pane.collections.untitled=Sense títol
-pane.collections.unfiled=Ítems sense arxivar
-pane.collections.duplicate=Duplicate Items
+pane.collections.unfiled=Elements sense emplenar
+pane.collections.duplicate=Duplica els elements
 
 pane.collections.menu.rename.collection=Canvia el nom de la col·lecció...
 pane.collections.menu.edit.savedSearch=Edita la cerca desada
@@ -132,36 +160,42 @@ pane.collections.menu.generateReport.collection=Genera un informe a partir de la
 pane.collections.menu.generateReport.savedSearch=Genera un informe a partir de la cerca desada...
 
 pane.tagSelector.rename.title=Si us plau entra un nou nom per aquesta etiqueta.
-pane.tagSelector.rename.message=Aquesta etiqueta serà canviada per a tots els elements associats.
-pane.tagSelector.delete.title=Estàs segur que vols esborrar aquesta etiqueta?
-pane.tagSelector.delete.message=Aquesta etiqueta serà esborrada de tots els elements.
-pane.tagSelector.numSelected.none=Cap etiqueta seleccionada
+pane.tagSelector.rename.message=Aquesta etiqueta es canviarà per a tots els elements associats.
+pane.tagSelector.delete.title=Segur que voleu esborrar aquesta etiqueta?
+pane.tagSelector.delete.message=Aquesta etiqueta s'esborrarà de tots els elements.
+pane.tagSelector.numSelected.none=No hi ha cap etiqueta seleccionada
 pane.tagSelector.numSelected.singular=%S etiqueta seleccionada
 pane.tagSelector.numSelected.plural=%S etiquetes seleccionades
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Carregant la llista d'elements...
-pane.items.trash.title=Mou a la Paperera
-pane.items.trash=Segur que vols moure l'ítem seleccionat a la Paperera?
-pane.items.trash.multiple=Segur que vols moure els ítems seleccionats a la Paperera?
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
+pane.items.trash.title=Mou a la paperera
+pane.items.trash=Segur que voleu moure l'element seleccionat a la paperera?
+pane.items.trash.multiple=Segur que voleu moure els elements seleccionats a la paperera?
 pane.items.delete.title=Elimina
-pane.items.delete=Estàs segur que vols eliminar l'element seleccionat?
-pane.items.delete.multiple=Estàs segur que vols eliminar els elements seleccionats?
+pane.items.delete=Segur que voleu eliminar l'element seleccionat?
+pane.items.delete.multiple=Segur que voleu eliminar els elements seleccionats?
 pane.items.menu.remove=Elimina l'element seleccionat
 pane.items.menu.remove.multiple=Elimina els elements seleccionats
-pane.items.menu.erase=Elimina l'element seleccionat de la Llibreria...
-pane.items.menu.erase.multiple=Elimina els elements seleccionats de la Llibreria...
+pane.items.menu.erase=Elimina l'element seleccionat de la biblioteca...
+pane.items.menu.erase.multiple=Elimina els elements seleccionats de la biblioteca...
 pane.items.menu.export=Exporta l'element seleccionat...
-pane.items.menu.export.multiple=Exporta els elements seleccionat...
-pane.items.menu.createBib=Crea bibliografia a partir de l'element seleccionat...
-pane.items.menu.createBib.multiple=Crea bibliografia a partir dels elements seleccionats...
+pane.items.menu.export.multiple=Exporta els elements seleccionats...
+pane.items.menu.createBib=Crea una bibliografia a partir de l'element seleccionat...
+pane.items.menu.createBib.multiple=Crea una bibliografia a partir dels elements seleccionats...
 pane.items.menu.generateReport=Genera un informe a partir de l'element seleccionat...
 pane.items.menu.generateReport.multiple=Genera un informe a partir dels elements seleccionats...
 pane.items.menu.reindexItem=Reindexa element
 pane.items.menu.reindexItem.multiple=Reindexa elements
 pane.items.menu.recognizePDF=Recupera metadades per a fitxers PDF
-pane.items.menu.recognizePDF.multiple=Recuperar metadades per a fitxers PDF
-pane.items.menu.createParent=Crea un ítem ascendent de l'ítem seleccionat
-pane.items.menu.createParent.multiple=Crea ítems ascendents dels ítems seleccionats
+pane.items.menu.recognizePDF.multiple=Recupera metadades per a fitxers PDF
+pane.items.menu.createParent=Crea un element ascendent de l'element seleccionat
+pane.items.menu.createParent.multiple=Crea elements ascendents dels elements seleccionats
 pane.items.menu.renameAttachments=Canvia el nom del fitxer amb les metadades ascendents
 pane.items.menu.renameAttachments.multiple=Canvia els noms del fitxers amb les metadades ascendents
 
@@ -174,54 +208,60 @@ pane.items.interview.twoParticipants=Entrevista per %S i %S
 pane.items.interview.threeParticipants=Entrevista per %S, %S i %S
 pane.items.interview.manyParticipants=Entrevista per %S i altres
 
-pane.item.selected.zero=Cap element seleccionat
+pane.item.selected.zero=No hi ha cap element seleccionat
 pane.item.selected.multiple=%S elements seleccionats
-pane.item.unselected.zero=No items in this view
-pane.item.unselected.singular=%S item in this view
-pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+pane.item.unselected.zero=No hi ha elements en aquesta visualització
+pane.item.unselected.singular=%S element en aquesta visualització
+pane.item.unselected.plural=%S elements en aquesta visualització
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Canvia el tipus d'element
-pane.item.changeType.text=Estàs segur que vols canviar el tipus d'element?\n\n Es perdran els següents camps:
+pane.item.changeType.text=Segur que voleu canviar el tipus d'element?\n\n Es perdran els camps següents:
 pane.item.defaultFirstName=primer
 pane.item.defaultLastName=últim
 pane.item.defaultFullName=Nom complet
 pane.item.switchFieldMode.one=Canvia a un sol camp
 pane.item.switchFieldMode.two=Canvia a dos camps
-pane.item.creator.moveUp=Move Up
-pane.item.creator.moveDown=Move Down
+pane.item.creator.moveUp=Mou amunt
+pane.item.creator.moveDown=Mou avall
 pane.item.notes.untitled=Nota sense títol
-pane.item.notes.delete.confirm=Estàs segur que vols eliminar aquesta nota?
+pane.item.notes.delete.confirm=Segur que voleu eliminar aquesta nota?
 pane.item.notes.count.zero=Cap nota:
 pane.item.notes.count.singular=%S nota:
 pane.item.notes.count.plural=%S notes:
 pane.item.attachments.rename.title=Nou títol:
-pane.item.attachments.rename.renameAssociatedFile=Canvia el nom de l'arxiu associat
-pane.item.attachments.rename.error=Ha succeït un error quan es canviava el nom de l'arxiu.
-pane.item.attachments.fileNotFound.title=Arxiu no trobat
-pane.item.attachments.fileNotFound.text=L'arxiu adjunt no es pot trobar.\n\nPotser ha estat mogut fora de Zotero.
+pane.item.attachments.rename.renameAssociatedFile=Canvia el nom del fitxer associat
+pane.item.attachments.rename.error=S'ha produït un error quan es canviava el nom del fitxer.
+pane.item.attachments.fileNotFound.title=No s'ha trobat el fitxer
+pane.item.attachments.fileNotFound.text=No s'ha pogut trobar el fitxer adjunt.\n\nPotser s'ha mogut o s'ha esborrat fora del Zotero.
 pane.item.attachments.delete.confirm=Estàs segur que vols eliminar aquest arxiu adjunt?
-pane.item.attachments.count.zero=Cap arxiu adjunt:
+pane.item.attachments.count.zero=Cap fitxer adjunt:
 pane.item.attachments.count.singular=%S arxiu adjunt:
-pane.item.attachments.count.plural=%S arxius adjunts:
-pane.item.attachments.select=Selecciona un arxiu
+pane.item.attachments.count.plural=%S fitxers adjunts:
+pane.item.attachments.select=Selecciona un fitxer
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=clica aquí
-pane.item.tags=Etiquetes:
 pane.item.tags.count.zero=Cap etiqueta:
 pane.item.tags.count.singular=%S etiqueta:
 pane.item.tags.count.plural=%S etiquetes:
 pane.item.tags.icon.user=Etiqueta afegida per l'usuari
 pane.item.tags.icon.automatic=Etiqueta afegida automàticament
-pane.item.related=Relacionat:
 pane.item.related.count.zero=Cap element relacionat:
 pane.item.related.count.singular=%S element relacionat:
 pane.item.related.count.plural=%S elements relacionats:
-pane.item.parentItem=Ítem ascendent
+pane.item.parentItem=Element ascendent
 
-noteEditor.editNote=Edita nota
+noteEditor.editNote=Edita la nota
 
 itemTypes.note=Nota
-itemTypes.attachment=Arxiu adjunt
+itemTypes.attachment=Fitxer adjunt
 itemTypes.book=Llibre
 itemTypes.bookSection=Capítol d'un llibre
 itemTypes.journalArticle=Article de revista acadèmica
@@ -243,7 +283,7 @@ itemTypes.statute=Estatut
 itemTypes.email=Correu electrònic
 itemTypes.map=Mapa
 itemTypes.blogPost=Entrada de bloc
-itemTypes.instantMessage=Missatge instantàni
+itemTypes.instantMessage=Missatge instantani
 itemTypes.forumPost=Comentari en un fòrum
 itemTypes.audioRecording=Enregistrament d'àudio
 itemTypes.presentation=Presentació
@@ -264,7 +304,7 @@ itemFields.dateModified=Modificat
 itemFields.source=Font
 itemFields.notes=Notes
 itemFields.tags=Etiquetes
-itemFields.attachments=Arxius adjunts
+itemFields.attachments=Fitxers adjunts
 itemFields.related=Elements relacionats
 itemFields.url=URL
 itemFields.rights=Drets
@@ -280,13 +320,13 @@ itemFields.publicationTitle=Publicació
 itemFields.ISSN=ISSN
 itemFields.date=Data
 itemFields.section=Secció
-itemFields.callNumber=Número de Catàleg
+itemFields.callNumber=Número de catàleg
 itemFields.archiveLocation=Localització a l'arxiu
 itemFields.distributor=Distribuïdor
 itemFields.extra=Extra
 itemFields.journalAbbreviation=Abreviatura de la revista
 itemFields.DOI=DOI
-itemFields.accessDate=Accedit
+itemFields.accessDate=Últim accés
 itemFields.seriesTitle=Títol de la sèrie
 itemFields.seriesText=Text de la sèrie
 itemFields.seriesNumber=Número de la sèrie
@@ -298,7 +338,7 @@ itemFields.legislativeBody=Cos legislatiu
 itemFields.history=Història
 itemFields.reporter=Reporter
 itemFields.court=Tribunal
-itemFields.numberOfVolumes=# de volums
+itemFields.numberOfVolumes=Nre. de volums
 itemFields.committee=Comitè
 itemFields.assignee=Assignatari
 itemFields.patentNumber=Número de patent
@@ -327,18 +367,18 @@ itemFields.studio=Estudi
 itemFields.runningTime=Durada
 itemFields.network=Xarxa
 itemFields.postType=Tipus d'escrit
-itemFields.audioFileType=Tipus d'arxiu
+itemFields.audioFileType=Tipus de fitxer
 itemFields.version=Versió
 itemFields.system=Sistema
-itemFields.company=Companyia
+itemFields.company=Empresa
 itemFields.conferenceName=Títol de la conferència
 itemFields.encyclopediaTitle=Títol de l'enciclopèdia
 itemFields.dictionaryTitle=Títol del diccionari
 itemFields.language=Llengua
-itemFields.programmingLanguage=Llenguatge
+itemFields.programmingLanguage=Llengua
 itemFields.university=Universitat
 itemFields.abstractNote=Resum
-itemFields.websiteTitle=Títol de la web
+itemFields.websiteTitle=Títol del web
 itemFields.reportNumber=Número d'informe
 itemFields.billNumber=Número de llei
 itemFields.codeVolume=Volum del codi
@@ -348,7 +388,7 @@ itemFields.reporterVolume=Volum del reporter
 itemFields.firstPage=Primera pàgina
 itemFields.documentNumber=Número de document
 itemFields.dateEnacted=Data d'aprovació
-itemFields.publicLawNumber=Número de Dret Públic
+itemFields.publicLawNumber=Número de dret públic
 itemFields.country=País
 itemFields.applicationNumber=Número d'aplicació
 itemFields.forumTitle=Títol de fòrum/llista
@@ -362,7 +402,7 @@ itemFields.proceedingsTitle=Títol de la ponència
 itemFields.bookTitle=Títol del llibre
 itemFields.shortTitle=Títol curt
 itemFields.docketNumber=Número d'expedient
-itemFields.numPages=# of pàgines
+itemFields.numPages=Nre. de pàgines
 itemFields.programTitle=Títol del programa
 itemFields.issuingAuthority=Autoritat emissora
 itemFields.filingDate=Data de presentació
@@ -385,7 +425,7 @@ creatorTypes.counsel=Conseller
 creatorTypes.inventor=Inventor
 creatorTypes.attorneyAgent=Representant/Agent
 creatorTypes.recipient=Receptor
-creatorTypes.performer=Interpret
+creatorTypes.performer=Intèrpret
 creatorTypes.composer=Compositor
 creatorTypes.wordsBy=Lletrista
 creatorTypes.cartographer=Cartògraf
@@ -396,7 +436,7 @@ creatorTypes.presenter=Presentador
 creatorTypes.guest=Convidat
 creatorTypes.podcaster=Podcaster
 creatorTypes.reviewedAuthor=Autor revisat
-creatorTypes.cosponsor=Co-patrocinador
+creatorTypes.cosponsor=Copatrocinador
 creatorTypes.bookAuthor=Autor del llibre
 
 fileTypes.webpage=Pàgina web
@@ -407,58 +447,73 @@ fileTypes.video=Vídeo
 fileTypes.presentation=Presentació
 fileTypes.document=Document
 
-save.attachment=Desant captura...
-save.link=Desant enllaç...
+save.attachment=Desant la captura...
+save.link=Desant l'enllaç...
 save.link.error=S'ha produït un error en desar aquest enllaç.
-save.error.cannotMakeChangesToCollection=No pots fer canvis en la col·lecció seleccionada actualment.
-save.error.cannotAddFilesToCollection=No pots afegir fitxers en la col·lecció seleccionada actualment.
+save.error.cannotMakeChangesToCollection=No podeu fer canvis a la col·lecció seleccionada actualment.
+save.error.cannotAddFilesToCollection=No podeu afegir fitxers a la col·lecció seleccionada actualment.
 
-ingester.saveToZotero=Desa a Zotero
-ingester.saveToZoteroUsing=Desa a Zotero amb "%S"
+ingester.saveToZotero=Desa al Zotero
+ingester.saveToZoteroUsing=Desa al Zotero amb "%S"
 ingester.scraping=Desant l'element...
+ingester.scrapingTo=Saving to
 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.scrapeErrorDescription.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 a causa d'un error anterior de Zotero.
 
 ingester.importReferRISDialog.title=Importació RIS/Refer de Zotero
-ingester.importReferRISDialog.text=Vols importar elements de "%1$S" a Zotero?\n\nPots desactivar la importació automàtica de RIS/Refer en les preferències de Zotero.
-ingester.importReferRISDialog.checkMsg=Permetre sempre a aquest lloc
+ingester.importReferRISDialog.text=Voleu importar elements de "%1$S" a Zotero?\n\nPodeu desactivar la importació automàtica de RIS/Refer a les preferències del Zotero.
+ingester.importReferRISDialog.checkMsg=Permet sempre a aquest lloc
 
 ingester.importFile.title=Importa el fitxer
-ingester.importFile.text=Vols importar el fitxer "%S"?\n\nEls ítems s'afegiran a una nova col·lecció.
+ingester.importFile.text=Voleu importar el fitxer "%S"?\n\nEls elements s'afegiran a una col·lecció nova.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Realitzant una cerca...
-ingester.lookup.error=S'ha produït un error en mentre es cercava aquest ítem.
+ingester.lookup.error=S'ha produït un error mentre se cercava aquest element.
 
-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.
-db.dbCorruptedNoBackup=Sembla que la base de dades '%S' de Zotero s'ha corromput i no hi ha cap copia de seguretat disponible.\n\nEs crearà una nova base de dades. L'arxiu malmès s'ha desat al directori de Zotero.
-db.dbRestored=Sembla que la base de dades '%1$S' de Zotero s'ha corromput.\n\nLes teves dades s'han recuperat des de l'última copia de seguretat disponible feta el %2$S a les %3$S. L'arxiu malmès s'ha desat al directori de Zotero.
-db.dbRestoreFailed=Sembla que la base de dades '%S' de Zotero s'ha corromput i l'intent de recuperació a partir de l'última copia de seguretat disponible ha fallat. L'arxiu malmès s'ha desat al directori de Zotero.
+db.dbCorrupted=Sembla que la base de dades '%S' del Zotero està malmesa.
+db.dbCorrupted.restart=Reinicieu el Firefox per intentar una restauració automàtica a partir de l'última còpia de seguretat.
+db.dbCorruptedNoBackup=Sembla que la base de dades '%S' de Zotero està malmesa i no hi ha cap còpia de seguretat disponible.\n\nEs crearà una nova base de dades. El fitxer malmès s'ha desat al directori del Zotero.
+db.dbRestored=Sembla que la base de dades '%1$S' del Zotero està malmesa.\n\nLes dades s'han recuperat des de l'última còpia de seguretat disponible feta el %2$S a les %3$S. El fitxer malmès s'ha desat al directori del Zotero.
+db.dbRestoreFailed=Sembla que la base de dades '%S' del Zotero està malmesa i l'intent de recuperació a partir de l'última copia de seguretat disponible ha fallat. L'arxiu malmès s'ha desat al directori de Zotero.
 
-db.integrityCheck.passed=No s'han trobat erros a la base de dades
-db.integrityCheck.failed=S'han trobat erros a la base de dades!
+db.integrityCheck.passed=No s'han trobat erros a la base de dades.
+db.integrityCheck.failed=S'han trobat erros a la base de dades.
 db.integrityCheck.dbRepairTool=Podeu utilitzar l'eina de reparació de base de dades en http://zotero.org/utils/dbfix per intentar corregir aquests errors.
-db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
-db.integrityCheck.appRestartNeeded=%S will need to be restarted.
-db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
-db.integrityCheck.errorsFixed=The errors in your Zotero database have been corrected.
-db.integrityCheck.errorsNotFixed=Zotero was unable to correct all the errors in your database.
-db.integrityCheck.reportInForums=You can report this problem in the Zotero Forums.
+db.integrityCheck.repairAttempt=Zotero pot intentar corregir aquests errors.
+db.integrityCheck.appRestartNeeded=Caldrà que reinicieu %S.
+db.integrityCheck.fixAndRestart=Corregeix errors i reinicia %S
+db.integrityCheck.errorsFixed=S'han corregit els errors de la vostra base de dades del Zotero.
+db.integrityCheck.errorsNotFixed=El Zotero no pot corregir tots els errors de la vostra base de dades.
+db.integrityCheck.reportInForums=Podeu informar d'aquest problema als Fòrums del Zotero.
 
 zotero.preferences.update.updated=Actualitzat
 zotero.preferences.update.upToDate=Actual
 zotero.preferences.update.error=Error
-zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when possible
+zotero.preferences.launchNonNativeFiles=Obre els PDF i la resta de fitxers a %S quan sigui possible
 zotero.preferences.openurl.resolversFound.zero=No s'ha trobat cap resoledor
 zotero.preferences.openurl.resolversFound.singular=%S resoledor trobat
 zotero.preferences.openurl.resolversFound.plural=%S resoledor found
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Reconstruir índex
-zotero.preferences.search.rebuildWarning=Vols reconstruir l'índex sencer? Això pot trigar una mica.\n\nPer indexar només els elements que no han estat indexats fes servir %S.
-zotero.preferences.search.clearIndex=Neteja l'Índex
-zotero.preferences.search.clearWarning=Després de netejar l'índex el contingut dels arxius adjunts no serà cercable.\n\nEls enllaços web no es poden reindexar sense tornar a visitar la pàgina. Per a deixar els enllaços web indexats escull %S.
+zotero.preferences.search.rebuildWarning=Voleu reconstruir l'índex sencer? Això pot tardar una mica.\n\nPer indexar només els elements que no han estat indexats feu servir %S.
+zotero.preferences.search.clearIndex=Neteja l'índex
+zotero.preferences.search.clearWarning=Després de netejar l'índex el contingut dels fitxers adjunts no serà cercable.\n\nEls enllaços web no es poden reindexar sense tornar a visitar la pàgina. Per a deixar els enllaços web indexats escull %S.
 zotero.preferences.search.clearNonLinkedURLs=Neteja-ho to excepte els enllaços web
 zotero.preferences.search.indexUnindexed=Indexa els elements no indexats
 zotero.preferences.search.pdf.toolRegistered=%S està instal·lat
@@ -469,56 +524,65 @@ zotero.preferences.search.pdf.advancedUsers=Els usuaris avançats pot ser que vu
 zotero.preferences.search.pdf.documentationLink=documentació
 zotero.preferences.search.pdf.checkForInstaller=Comprova l'instal·lador
 zotero.preferences.search.pdf.downloading=Descarregant...
-zotero.preferences.search.pdf.toolDownloadsNotAvailable=Les %S eines actualment no estan disponibles per a la teva plataforma via zotero.org.
+zotero.preferences.search.pdf.toolDownloadsNotAvailable=Les %S eines actualment no estan disponibles per a la vostra plataforma via zotero.org.
 zotero.preferences.search.pdf.viewManualInstructions=Mira la documentació per a intruccions d'instal·lació manual.
-zotero.preferences.search.pdf.availableDownloads=Descarregues disponibles per a %1$S des de %2$S:
+zotero.preferences.search.pdf.availableDownloads=Descàrregues disponibles per a %1$S des de %2$S:
 zotero.preferences.search.pdf.availableUpdates=Actualitzacions disponibles per a %1$S des de %2$S:
 zotero.preferences.search.pdf.toolVersionPlatform=%1$S versió %2$S
 zotero.preferences.search.pdf.zoteroCanInstallVersion=Zotero pot instal·lar-ho automàticament al directori de dades de Zotero
-zotero.preferences.search.pdf.zoteroCanInstallVersions=Zotero pot instal·lar-les automàticament al directori de dades de Zotero
+zotero.preferences.search.pdf.zoteroCanInstallVersions=Zotero les pot instal·lar automàticament al directori de dades de Zotero
 zotero.preferences.search.pdf.toolsDownloadError=S'ha produït un error quan s'intentava descarregar l'eina %S des de zotero.org.
-zotero.preferences.search.pdf.tryAgainOrViewManualInstructions=Si-us-plau, torna a provar-ho més tard o mira la documentació per a les instruccions per a l'instal·lació manual.
+zotero.preferences.search.pdf.tryAgainOrViewManualInstructions=Torneu-ho a provar més tard o consulteu la documentació per a les instruccions de la instal·lació manual.
 zotero.preferences.export.quickCopy.bibStyles=Estils bibliogràfics
 zotero.preferences.export.quickCopy.exportFormats=Formats d'exportació
-zotero.preferences.export.quickCopy.instructions=Copia ràpida permet copiar les referències seleccionades al portaretalls prement una drecera de teclat o arrossegant els elements a un quadre de text en una pàgina web.
-zotero.preferences.export.quickCopy.citationInstructions=For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
+zotero.preferences.export.quickCopy.instructions=La còpia ràpida permet copiar les referències seleccionades al porta-retalls prement una drecera de teclat o arrossegant els elements a un quadre de text en una pàgina web.
+zotero.preferences.export.quickCopy.citationInstructions=Per als estils de bibliografia, podeu copiar les cites o les notes al peu de pàgina prement %S o mantenint premuda la tecla Maj abans d'arrossegar els elements.
 zotero.preferences.styles.addStyle=Afegeix un estil
 
-zotero.preferences.advanced.resetTranslatorsAndStyles=Reinicialitzar traductors i estils
+zotero.preferences.advanced.resetTranslatorsAndStyles=Reinicialitza traductors i estils
 zotero.preferences.advanced.resetTranslatorsAndStyles.changesLost=Qualsevol traductor i/o estil nou o modificat es perdrà
-zotero.preferences.advanced.resetTranslators=Reinicialitzar traductors
+zotero.preferences.advanced.resetTranslators=Reinicialitza els traductors
 zotero.preferences.advanced.resetTranslators.changesLost=Qualsevol traductor nou o modificat es perdrà
-zotero.preferences.advanced.resetStyles=Reinicialitzar estils
+zotero.preferences.advanced.resetStyles=Reinicialitza els estils
 zotero.preferences.advanced.resetStyles.changesLost=Qualsevol estil nou o modificat es perdrà
 
-dragAndDrop.existingFiles=Els següents arxiu ja existeixen al directori de destí i no poden ser copiats:
-dragAndDrop.filesNotFound=Els següents arxius no s'han trobat i no s'han pogut copiar:
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
+dragAndDrop.existingFiles=Els fitxers següents ja existeixen al directori de destinació i no es poden copiar:
+dragAndDrop.filesNotFound=Els fitxers següents no s'han trobat i no s'han pogut copiar:
 
 fileInterface.itemsImported=Important elements...
 fileInterface.itemsExported=Exportant elements...
-fileInterface.import=Importar
-fileInterface.export=Exportar
+fileInterface.import=Importa
+fileInterface.export=Exporta
 fileInterface.exportedItems=Elements exportats
 fileInterface.imported=Importat
-fileInterface.fileFormatUnsupported=No s'ha pogut trobar un traductor per aquest arxiu.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Bibliografia sense títol
 fileInterface.bibliographyHTMLTitle=Bibliografia
-fileInterface.importError=Ha succeït un error quan s'intentava importar l'arxiu seleccionat. Si us plau assegura't que l'arxiu és correcte i tornar-ho a intentar.
+fileInterface.importError=S'ha produït un error quan s'intentava importar el fitxer seleccionat. Assegureu-vos que el fitxer és correcte i torneu-ho a intentar.
 fileInterface.importClipboardNoDataError=No s'han pogut llegir dades importables des del porta-retalls.
-fileInterface.noReferencesError=Els elements seleccionats no contenen cap referència. Si us plau selecciona una o més referències i tornar-ho a intentar.
-fileInterface.bibliographyGenerationError=Ha succeït un error quan es generava la bibliografia. Si us plau torna-ho a intentar.
-fileInterface.exportError=Ha succeït un error quan s'intentava exportar l'element seleccionat.
+fileInterface.noReferencesError=Els elements seleccionats no contenen cap referència. Seleccioneu una o més referències i tornar-ho a intentar.
+fileInterface.bibliographyGenerationError=S'ha produït un error quan es generava la bibliografia. Torneu-ho a intentar.
+fileInterface.exportError=S'ha produït un error quan s'intentava exportar l'element seleccionat.
 
-advancedSearchMode=Mode de cerca avançada — prem la tecla de Retorn per a cercar
-searchInProgress=Cerca en curs — si us plau tingues paciència
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
+advancedSearchMode=Mode de cerca avançada — premeu la tecla de Retorn per a cercar
+searchInProgress=Cerca en curs — espereu.
 
 searchOperator.is=és
 searchOperator.isNot=no és
 searchOperator.beginsWith=comença amb
 searchOperator.contains=conté
 searchOperator.doesNotContain=no conté
-searchOperator.isLessThan=és menor que
-searchOperator.isGreaterThan=és major que
+searchOperator.isLessThan=és més petit de
+searchOperator.isGreaterThan=és més gran de
 searchOperator.isBefore=és abans
 searchOperator.isAfter=és després
 searchOperator.isInTheLast=és en l'últim
@@ -535,7 +599,7 @@ searchConditions.type=Tipus
 searchConditions.thesisType=Tipus de tesi
 searchConditions.reportType=Tipus d'informe
 searchConditions.videoRecordingFormat=Format de gravació de vídeo
-searchConditions.audioFileType=Tipus d'arxiu d'àudio
+searchConditions.audioFileType=Tipus de fitxer d'àudio
 searchConditions.audioRecordingFormat=Format de gravació d'àudio
 searchConditions.letterType=Tipus de carta
 searchConditions.interviewMedium=Mitjà de l'entrevista
@@ -546,17 +610,17 @@ searchConditions.medium=Mitjà
 searchConditions.artworkMedium=Mitjà artístic
 searchConditions.dateModified=Data de modificació
 searchConditions.fulltextContent=Contingut de l'arxiu adjunt
-searchConditions.programmingLanguage=Llenguatge de programació
-searchConditions.fileTypeID=Tipus d'arxiu adjunt
+searchConditions.programmingLanguage=Llengua de programació
+searchConditions.fileTypeID=Tipus de fitxer adjunt
 searchConditions.annotation=Anotació
 
 fulltext.indexState.indexed=Indexat
 fulltext.indexState.unavailable=Desconegut
 fulltext.indexState.partial=Parcial
 
-exportOptions.exportNotes=Exportar les notes
-exportOptions.exportFileData=Exportar els arxius adjunts
-exportOptions.useJournalAbbreviation=Use Journal Abbreviation
+exportOptions.exportNotes=Exporta les notes
+exportOptions.exportFileData=Exporta els fitxers adjunts
+exportOptions.useJournalAbbreviation=Utilitza l'abreviació de la publicació
 charset.UTF8withoutBOM=Unicode (UTF-8 sense BOM)
 charset.autoDetect=(Detecció automàtica)
 
@@ -571,88 +635,97 @@ date.tomorrow=demà
 citation.multipleSources=Múltiples fonts...
 citation.singleSource=Única font...
 citation.showEditor=Mostra editor...
-citation.hideEditor=Oculta editor...
-citation.citations=Citations
+citation.hideEditor=Oculta l'editor...
+citation.citations=Cites
 citation.notes=Notes
 
-report.title.default=Informe de Zotero
+report.title.default=Informe del Zotero
 report.parentItem=Element pare:
 report.notes=Notes:
 report.tags=Etiquetes:
 
-annotations.confirmClose.title=Estàs segur que vols tancar aquesta anotació?
+annotations.confirmClose.title=Segur que voleu tancar l'anotació?
 annotations.confirmClose.body=Tot el text es perdrà.
 annotations.close.tooltip=Esborra l'anotació.
 annotations.move.tooltip=Mou l'anotació.
 annotations.collapse.tooltip=Col·lapsa l'anotació.
 annotations.expand.tooltip=Expandeix l'anotació.
-annotations.oneWindowWarning=Les anotacions en una captura només es poden obrir en una finestra del navegador simultàniament. Aquesta captura s'obrirà sense aanotacions
+annotations.oneWindowWarning=Les anotacions en una captura només es poden obrir en una finestra del navegador simultàniament. Aquesta captura s'obrirà sense anotacions.
 
 integration.fields.label=Camps
 integration.referenceMarks.label=Marques de referències
-integration.fields.caption=Els camps de Microsoft Word són menys susceptibles de ser accidentalment modificats però no es poden compartir amb OpenOffice.
+integration.fields.caption=Els camps del Microsoft Word són menys susceptibles de modificar-se accidentalment, però no es poden compartir amb l'OpenOffice.
 integration.fields.fileFormatNotice=Cal desar el document en el format de fitxer .doc o .docx.
-integration.referenceMarks.caption=Les marques de referències d'OpenOffice són menys susceptibles de ser accidentalment modificats però no es poden compartir amb Microsoft. Word
+integration.referenceMarks.caption=Les marques de referències de l'OpenOffice són menys susceptibles de modificar-se accidentalment, però no es poden compartir amb el Microsoft Word.
 integration.referenceMarks.fileFormatNotice=Cal desar el document en el format de fitxer .odt.
 
-integration.regenerate.title=Vols regenerar la cita?
+integration.regenerate.title=Voleu regenerar la cita?
 integration.regenerate.body=Els canvis fets a l'editor de cites es perdran.
 integration.regenerate.saveBehavior=Segueix sempre aquesta selecció.
 
-integration.revertAll.title=Segur que vols revertir tots els canvis a la teva bibliografia?
-integration.revertAll.body=Si decideixes continuar, totes les referències citades en el text apareixeran a la bibliografia amb el seu text original i s'eliminaran de la bibliografia totes les referències agregades manualment.
-integration.revertAll.button=Revertir tot
-integration.revert.title=Segur que vols revertir aquesta canvi?
-integration.revert.body=Si decideixes continuar, el text de les entrades de la bibliografia corresponents al(s) ítem(s) seleccionat(s) serà reemplaçat pel text sense modificar especificat per l'estil seleccionat.
-integration.revert.button=Revertir
-integration.removeBibEntry.title=Les referències seleccionades es citen en el document.
-integration.removeBibEntry.body=Segur que vols ometre-la en la teva bibliografia?
+integration.revertAll.title=Segur que voleu revertir tots els canvis a la vostra bibliografia?
+integration.revertAll.body=Si decidiu continuar, totes les referències citades al text apareixeran a la bibliografia amb el text original i s'eliminaran de la bibliografia totes les referències afegides manualment.
+integration.revertAll.button=Reverteix-ho tot
+integration.revert.title=Segur que voleu revertir aquest canvi?
+integration.revert.body=Si decidiu continuar, el text de les entrades de la bibliografia corresponents a l'element seleccionat (o els elements seleccionats) se substituirà pel text sense modificar especificat per l'estil seleccionat.
+integration.revert.button=Reverteix
+integration.removeBibEntry.title=Les referències seleccionades se citen al document.
+integration.removeBibEntry.body=Segur que la voleu ometre a la vostra bibliografia?
 
 integration.cited=Citades
-integration.cited.loading=Carregant ítems citats
+integration.cited.loading=Carregant els elements citats...
 integration.ibid=ibídem
 integration.emptyCitationWarning.title=Cita en blanc
-integration.emptyCitationWarning.body=La cita s'ha especificat estaria buida en l'estil seleccionat. Segur que voleu afegir-la?
+integration.emptyCitationWarning.body=La cita s'ha especificat estaria buida en l'estil seleccionat. Segur que la voleu afegir?
+integration.openInLibrary=Open in %S
 
-integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
-integration.error.incompatibleVersion2=Zotero %1$S requereix %2$S %3$S o versions posteriors. Si us plau descarregueu la darrera versió de %2$S des de zotero.org.
-integration.error.title=Error d'integració de Zotero
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
-integration.error.generic=Zotero ha sofert un error en l'actualització del seu document.
+integration.error.incompatibleVersion=Aquesta versió del connector de processador de textos del Zotero ($INTEGRATION_VERSION) és incompatible ambla versió actual del Zotero (%1$S). Assegureu-vos que feu servir les darreres versions de tots dos components.
+integration.error.incompatibleVersion2=Zotero %1$S requereix %2$S %3$S o versions posteriors. Descarregueu la darrera versió de %2$S des de zotero.org.
+integration.error.title=Error d'integració del Zotero
+integration.error.notInstalled=El Zotero no pot carregar el component necessari per comunicar-se amb el processador de textos. Assegureu-vos que hi ha instal·lada l'extensió apropiada i torneu-ho a intentar. 
+integration.error.generic=S'ha produït un error al Zotero en l'actualització del document.
 integration.error.mustInsertCitation=Cal inserir una cita abans de realitzar aquesta operació.
 integration.error.mustInsertBibliography=Cal inserir una bibliografia abans de realitzar aquesta operació.
-integration.error.cannotInsertHere=Els camps de Zotero no es poden inserir aquí.
+integration.error.cannotInsertHere=Els camps del Zotero no es poden inserir aquí.
 integration.error.notInCitation=Cal situar el cursor en una cita de Zotero per a editar-la.
-integration.error.noBibliography=L'estil bibliogràfic actual no defineix una bibliografia. Si vols afegir una bibliografia, si us plau tria un altre estil.
-integration.error.deletePipe=No s'ha pogut inicialitzar el conducte que Zotero utilitza per comunicar-se amb el processador de textos. T'agradaria que Zotero tractara de corregir aquest error? Se et demanarà la teva contrasenya.
-integration.error.invalidStyle=L'estil que has seleccionat no sembla vàlid. Si has creat aquest estil tu mateix, si us plau assegura't que passa la validació tal i com es descriu a http://zotero.org/support/dev/citation_styles. Com a alternativa, proba de seleccionar un altre estil.
-integration.error.fieldTypeMismatch=Zotero no pot actualitzar aquest document, ja que va ser creat per una aplicació de processament de textos diferent amb una codificació de camps incompatible. Per tal de fer un document compatible amb Word i OpenOffice.org/LibreOffice/NeoOffice, obre el document en el processador de textos amb què va ser creat originalment i canviar el tipus de camp a Marcadors en les Preferències de document de Zotero.
+integration.error.noBibliography=L'estil bibliogràfic actual no defineix una bibliografia. Si voleu afegir una bibliografia, trieu un altre estil.
+integration.error.deletePipe=No s'ha pogut inicialitzar el conducte que Zotero utilitza per comunicar-se amb el processador de textos. Voleu que el Zotero intenti corregir aquest error? Se us demanarà la contrasenya.
+integration.error.invalidStyle=L'estil que heu seleccionat no sembla vàlid. Si heu creat aquest estil, assegureu-vos que passa la validació tal i com es descriu a https://github.com/citation-style-language/styles/wiki/Validation. Com a alternativa, proveu de seleccionar un altre estil.
+integration.error.fieldTypeMismatch=El Zotero no pot actualitzar aquest document, ja que va ser creat per una aplicació de processament de textos diferent amb una codificació de camps incompatible. Per tal de fer un document compatible amb Word i OpenOffice.org/LibreOffice/NeoOffice, obriu el document en el processador de textos amb què va ser creat originalment i canvieu el tipus de camp a Marcadors en les Preferències de document del Zotero.
 
-integration.replace=Reemplaça aquest camp de Zotero?
-integration.missingItem.single=Aquest ítem ja no existeix a la base de dades de Zotero. Vols seleccionar un altre ítem?
-integration.missingItem.multiple=L'ítem %1$S d'aquesta cita ja no existeix a la base de dades de Zotero. Vols seleccionar un altre ítem?
-integration.missingItem.description=En fer clic a "No" es suprimiran els codis de camp de les cites que continguin aquest ítem i es mantindrà el text la cita però se suprimirà de la teva bibliografia.
+integration.replace=Substitueix aquest camp del Zotero?
+integration.missingItem.single=Aquest element ja no existeix a la base de dades del Zotero. Voleu seleccionar un altre element?
+integration.missingItem.multiple=L'element %1$S d'aquesta cita ja no existeix a la base de dades del Zotero. Voleu seleccionar un altre element?
+integration.missingItem.description=Si feu clic a "No" se suprimiran els codis de camp de les cites que continguin aquest element i es mantindrà el text de la cita, però se suprimirà de la vostra bibliografia.
 integration.removeCodesWarning=L'eliminació dels codis de camp evitarà que Zotero actualitzi les cites i bibliografies en aquest document. Segur que vols continuar?
-integration.upgradeWarning=Your document must be permanently upgraded in order to work with Zotero 2.0b7 or later. It is recommended that you make a backup before proceeding. Are you sure you want to continue?
+integration.upgradeWarning=El document ha d'estar actualitzat permanentment per treballar amb el Zotero 2.1 o versions posteriors. És reomanable que feu una còpia de seguretat abans de continuar. Segur que voleu continuar?
 integration.error.newerDocumentVersion=El document s'ha creat amb una versió més nova de Zotero (%1$S) que la versió actualment instal·lada (%1$S). Si us plau, actualitzeu Zotero abans de modificar aquest document.
-integration.corruptField=El codi de camp de Zotero corresponent a aquesta cita, què diu Zotero l'ítem de la biblioteca al qual la cita representa, ha estat danyat. T'agradaria tornar a seleccionar aquest ítem?
-integration.corruptField.description=En fer clic a "No" es suprimiran els codis de camp de les cites que continguin aquest element i es mantindrà el text la cita, però potencialment se suprimirà la teva bibliografia.
-integration.corruptBibliography=El codi de camp de Zotero de la teva bibliografia està danyat. Ha de netejar Zotero aquest codi de camp i generar una nova bibliografia?
-integration.corruptBibliography.description=Tots els ítems citats en el text apareixeran a la nova bibliografia però les modificacions que has fet al diàleg "Edita bibliografia" es perdran.
-integration.citationChanged=Has modificat aquesta cita des que Zotero la va generar. Vols mantenir a les teves modificacions i prevenir futures actualitzacions?
-integration.citationChanged.description=En fer clic a "Sí" evitaràs que Zotero actualitzi aquesta cita si n'afegeixes més de cites, commutes els estils, o modifiques la referència a què es refereix. En fer clic a "No", s'eliminaran els canvis.
-integration.citationChanged.edit=Has modificat aquesta cita des que Zotero la generà. Si l'edites netejaràs les teves modificacions. Vols continuar?
+integration.corruptField=El codi de camp del Zotero corresponent a aquesta cita, que diu Zotero l'element de la biblioteca al qual la cita representa, s'ha malmès. Voleu tornar a seleccionar aquest element?
+integration.corruptField.description=En fer clic a "No" se suprimiran els codis de camp de les cites que continguin aquest element i es mantindrà el text la cita, però potencialment se suprimirà la teva bibliografia.
+integration.corruptBibliography=El codi de camp del Zotero de la teva bibliografia està danyat. Ha de netejar Zotero aquest codi de camp i generar una nova bibliografia?
+integration.corruptBibliography.description=Tots els elements citats al text apareixeran a la nova bibliografia, però les modificacions que heu fet al diàleg "Edita la bibliografia" es perdran.
+integration.citationChanged=Heu modificat aquesta cita des que Zotero la va generar. Voleu mantenir les modificacions i prevenir futures actualitzacions?
+integration.citationChanged.description=En feu clic a "Sí" evitareu que el Zotero actualitzi aquesta cita si n'afegiu més de cites, commuteu els estils, o modifiqueu la referència a què es refereix. Si feu clic a "No", s'eliminaran els canvis.
+integration.citationChanged.edit=Heu modificat aquesta cita des que el Zotero la generà. Si l'editeu netejareu les modificacions. Voleu continuar?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Instal·la estil "%1$S" des de %2$S?
 styles.updateStyle=Actualitza l'estil existent "%1$S" amb "%2$S" des de %3$S?
 styles.installed=L'estil "%S" s'ha instal·lat correctament
 styles.installError=%S no sembla un fitxer d'estil vàlid.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S fa referència a un fitxer inexistent o no vàlid a %2$S com la seva font.
-styles.deleteStyle=Segur que vols suprimir l'estil "%1$S"?
-styles.deleteStyles=Segur que vols suprimir els estils seleccionats?
+styles.deleteStyle=Segur que voleu suprimir l'estil "%1$S"?
+styles.deleteStyles=Segur que voleu suprimir els estils seleccionats?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancel·la la sincronització
-sync.openSyncPreferences=Open Sync Preferences...
+sync.openSyncPreferences=Obre les preferències de sincroització...
 sync.resetGroupAndSync=Reinicia el grup i sincronitza
 sync.removeGroupsAndSync=Elimina el grup i sincronitza
 sync.localObject=Objecte local
@@ -660,18 +733,55 @@ sync.remoteObject=Objecte remot
 sync.mergedObject=Objecte fusionat
 
 sync.error.usernameNotSet=No s'ha establit un nom d'usuari
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=No s'ha establit una contrasenya
 sync.error.invalidLogin=Nom d'usuari o contrasenya no vàlid
-sync.error.enterPassword=Si us plau, introdueix una contrasenya.
-sync.error.loginManagerCorrupted1=Zotero cannot access your login information, likely due to a corrupted Firefox login manager database.
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
+sync.error.enterPassword=Introduïu una contrasenya.
+sync.error.loginManagerCorrupted1=El Zotero no pot accedir a la vostra informació d'entrada, likely due to a corrupted 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=Ja està en marxa una operació de sincronització.
-sync.error.syncInProgress.wait=Wait for the previous sync to complete or restart %S.
+sync.error.syncInProgress.wait=Wait for the previous sync to complete or restart Firefox.
 sync.error.writeAccessLost=Ja no tens accés d'escriptura al grupo de Zotero '%S'  i els fitxers que has afegit o editat no es poden sincronitzar amb el servidor.
-sync.error.groupWillBeReset=Si continues, la còpia del grup es reinicialitzarà al seu estat en el servidor i les modificacions locals des ítems i fixers es perdran.
+sync.error.groupWillBeReset=Si continueu, la còpia del grup es reinicialitzarà al vostre estat al servidor i les modificacions locals dels elements i els fitxers es perdran.
 sync.error.copyChangedItems=Cancel·la la sincronització ara si t'agradaria tenir l'oportunitat de copiar els canvis en un altre lloc o per tal de sol·licitar l'accés d'escriptura a un administrador del grup.
 sync.error.manualInterventionRequired=Una sincronització automàtica ha donat lloc a un conflicte que requereix intervenció manual.
 sync.error.clickSyncIcon=Fes clic a la icona de sincronització per sincronitzar de forma manual.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Encara no s'ha sincronitzat
 sync.status.lastSync=Darrera sincronització:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Carregant dades per sincronitzar el servidor
 sync.status.uploadAccepted=Càrrega acceptada \u2014 en espera del servidor de sincronització
 sync.status.syncingFiles=Sincronització dels fitxers
 
-sync.storage.kbRemaining=restan %SKB
+sync.storage.mbRemaining=%SMB remaining
+sync.storage.kbRemaining=resten %S kB
 sync.storage.filesRemaining=%1$S/%2$S fitxers
 sync.storage.none=Cap
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Fitxer local
 sync.storage.remoteFile=Fitxer remot
 sync.storage.savedFile=Fitxer desat
@@ -692,31 +805,44 @@ sync.storage.serverConfigurationVerified=Configuració del servidor verificada
 sync.storage.fileSyncSetUp=La sincronització de fitxers és configurada correctament.
 sync.storage.openAccountSettings=Obre la configuració del compte
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=No s'ha pogut contactar amb el servidor %S.
-sync.storage.error.permissionDeniedAtAddress=No tens permís per crear un directori de Zotero en la següent adreça:
-sync.storage.error.checkFileSyncSettings=Si us plau comprova la configuració de sincronització dels fitxers o posa't contacte amb l'administrador del servidor.
-sync.storage.error.verificationFailed=La verificació de%S ha fallat. Verifica la teva configuració de sincronització de fitxers en el panell de sincronització de les preferències de Zotero.
-sync.storage.error.fileNotCreated=No s'ha pogut crear el fitxer '%S' en el directori d'"emmagatzematge" de Zotero.
-sync.storage.error.fileEditingAccessLost=Ja no té accés d'edició de fitxers del grup de Zotero '%S' i els fitxers que has afegit o editat no es poden sincronitzar amb el servidor.
-sync.storage.error.copyChangedItems=Cancel·la la sincronització ara si t'agradaria tenir l'oportunitat de copiar els ítems i fitxers modificats en un altre lloc, .
+sync.storage.error.permissionDeniedAtAddress=No teniu permís per crear un directori del Zotero a l'adreça següent:
+sync.storage.error.checkFileSyncSettings=Comproveu la configuració de sincronització dels fitxers o poseu-vos en contacte amb l'administrador del servidor.
+sync.storage.error.verificationFailed=La verificació de %S ha fallat. Verifique la configuració de sincronització de fitxers al panell de sincronització de les preferències del Zotero.
+sync.storage.error.fileNotCreated=No s'ha pogut crear el fitxer '%S' al directori d'"emmagatzematge" del Zotero.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
+sync.storage.error.fileEditingAccessLost=Ja no teniu accés d'edició de fitxers del grup del Zotero '%S' i els fitxers que heu afegit o editat no es poden sincronitzar amb el servidor.
+sync.storage.error.copyChangedItems=Cancel·leu la sincronització ara si voleu tenir l'oportunitat de copiar els elements i els fitxers modificats en un altre lloc, .
 sync.storage.error.fileUploadFailed=La càrrega de fitxers ha fallat.
 sync.storage.error.directoryNotFound=No s'ha trobat el directori
 sync.storage.error.doesNotExist=%S no existeix.
-sync.storage.error.createNow=Vols crear-lo ara?
-sync.storage.error.webdav.enterURL=Si us plau, introduïu un URL WebDAV.
-sync.storage.error.webdav.invalidURL=%S no és un URL WebDAV vàlid.
-sync.storage.error.webdav.invalidLogin=El servidor WebDAV no va acceptar el nom d'usuari i contrasenya.
-sync.storage.error.webdav.permissionDenied=No tens permís per accedir a %S al servidor WebDAV.
-sync.storage.error.webdav.insufficientSpace=La càrrega del fitxer ha fallat per falta d'espai al servidor WebDAV.
-sync.storage.error.webdav.sslCertificateError=Error de certificat SSL en conectar-se a %S
-sync.storage.error.webdav.sslConnectionError=Error de certificat SSL en conectar-se a %S
-sync.storage.error.webdav.loadURLForMoreInfo=Carrega el teu URL WebDAV en el navegador per obtenir més informació.
-sync.storage.error.webdav.seeCertOverrideDocumentation=Consulta la documentació d'anul·lació del certificat per més informació.
-sync.storage.error.webdav.loadURL=Carrega l'URL WebDAV
-sync.storage.error.zfs.personalQuotaReached1=Has arribat al teu límit d'emmagatzematge de fitxers a Zotero. Alguns fitxers no s'han carregat. La resta de dades de Zotero continuarà sincronitzant-se amb el servidor.
-sync.storage.error.zfs.personalQuotaReached2=Llig la configuració del teu compte a zotero.org per conèixer opcions addicionals d'emmagatzematge.
-sync.storage.error.zfs.groupQuotaReached1=El grup '%S' ha arribat al seu límit d'emmagatzematge de fitxers a Zotero. Alguns fitxers no s'han carregat. La resta de dades de Zotero continuarà sincronitzant-se amb el servidor.
+sync.storage.error.createNow=Voleu crear-lo ara?
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
+sync.storage.error.webdav.invalidURL=%S no és una URL WebDAV vàlida.
+sync.storage.error.webdav.invalidLogin=El servidor WebDAV no accepta el nom d'usuari i contrasenya.
+sync.storage.error.webdav.permissionDenied=No teniu permís per accedir a %S al servidor WebDAV.
+sync.storage.error.webdav.insufficientSpace=La càrrega del fitxer ha fallat per manca d'espai al servidor WebDAV.
+sync.storage.error.webdav.sslCertificateError=Error de certificat SSL en connectar-se a %S
+sync.storage.error.webdav.sslConnectionError=Error de certificat SSL en connectar-se a %S
+sync.storage.error.webdav.loadURLForMoreInfo=Carregueu la URL WebDAV al navegador per obtenir més informació.
+sync.storage.error.webdav.seeCertOverrideDocumentation=Consulteu la documentació d'anul·lació del certificat per a més informació.
+sync.storage.error.webdav.loadURL=Carrega la URL WebDAV
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
+sync.storage.error.zfs.personalQuotaReached1=Heu arribat al límit d'emmagatzematge de fitxers al Zotero. Alguns fitxers no s'han carregat. La resta de dades del Zotero se seguiran sincronitzant amb el servidor.
+sync.storage.error.zfs.personalQuotaReached2=Llegiu la configuració del vostre compte a zotero.org per conèixer opcions addicionals d'emmagatzematge.
+sync.storage.error.zfs.groupQuotaReached1=El grup '%S' ha arribat al límit d'emmagatzematge de fitxers al Zotero. Alguns fitxers no s'han carregat. La resta de dades del Zotero es continuaran sincronitzant amb el servidor.
 sync.storage.error.zfs.groupQuotaReached2=El propietari del grup pot augmentar la capacitat d'emmagatzematge del grup des de la secció de configuració d'emmagatzematge en zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Desa l'etiqueta
 sync.longTagFixer.saveTags=Desa les etiquetes
@@ -735,7 +861,7 @@ proxies.notification.associated.label=Zotero ha associat automàticament aquest
 proxies.notification.redirected.label=Zotero ha redirigit automàticament la teva sol·licitud a %1$S a través del servidor intermediari %2$S.
 proxies.notification.enable.button=Enable...
 proxies.notification.settings.button=Proxy Settings...
-proxies.recognized.message=L'addició d'aquest servidor intermediari permet Zotero reconèixer els ítems de les seves pàgines i redirigirà automàticament les peticions futures a %1$S a través de %2$S.
+proxies.recognized.message=L'addició d'aquest servidor intermediari permet que el Zotero reconegui els elements de les pàgines i redirigeixi automàticament les peticions futures a %1$S a través de %2$S.
 proxies.recognized.add=Afegeix el servidor intermediari
 
 recognizePDF.noOCR=El PDF no conté text reconeixible.
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=No s'ha pogut llegir el text d'un PDF.
 recognizePDF.noMatches=No s'han trobat referències coincidents.
 recognizePDF.fileNotFound=No s'ha trobat el fitxer.
 recognizePDF.limit=Límit de consulta assolit. Intenta-ho més tard.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Recuperació de les metadades completada.
 recognizePDF.close.label=Tanca
 
@@ -753,17 +880,30 @@ rtfScan.rtf=Format de text enriquit (.rtf)
 rtfScan.saveTitle=Selecciona una ubicació per desar el fitxer formatat
 rtfScan.scannedFileSuffix=(Escanejat)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Error en la cerca
 lookup.failure.description=Zotero no va poder trobar un registre per l'identificador especificat. Si us plau, comprova l'identificador i torna a intentar-ho.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Veure en línia
-locate.online.tooltip=Ves a aquest ítem en línia
+locate.online.tooltip=Vés a aquest element en línia
 locate.pdf.label=Veure el PDF
 locate.pdf.tooltip=Obre el PDF amb el visor seleccionat
 locate.snapshot.label=Veure l'instantània
 locate.snapshot.tooltip=View snapshot for this item
 locate.file.label=Veure el fitxer
-locate.file.tooltip=Obra el fitxer utilitzant el visor seleccionat
+locate.file.tooltip=Obre el fitxer utilitzant el visor seleccionat
 locate.externalViewer.label=Obre en un visor extern
 locate.externalViewer.tooltip=Obre el fitxer en una altra aplicació
 locate.internalViewer.label=Obre en el visor intern
@@ -771,7 +911,7 @@ locate.internalViewer.tooltip=Obre el fitxer en aquesta aplicació
 locate.showFile.label=Mostra el fitxer
 locate.showFile.tooltip=Obre el directori on resideix el fitxer
 locate.libraryLookup.label=Cerca la biblioteca
-locate.libraryLookup.tooltip=Cerca aquest ítem utilitzant el resolutor OpenURL seleccionat
+locate.libraryLookup.tooltip=Cerca aquest element utilitzant el resolutor OpenURL seleccionat
 locate.manageLocateEngines=Manage Lookup Engines...
 
 standalone.corruptInstallation=La teva instal·lació de Zotero Independent sembla estar danyada a causa d'un error d'actualització automàtica. Mentre que Zotero pot seguir funcionant, per evitar possibles errors, si us plau descarrega la darrera versió de Zotero Independent de http://zotero.org/support/standalone tan aviat com sigui possible.
@@ -779,7 +919,7 @@ standalone.addonInstallationFailed.title=La intal·lació del complement ha fall
 standalone.addonInstallationFailed.body=No s'ha pogut instal·lar el complement "%S". Potser és incompatible amb aquesta versió de Zotero Independent.
 
 connector.error.title=Error del connector de Zotero
-connector.standaloneOpen=No es pot accedir a la base de dades perquè Zotero Independent està actualment obert. Si us plau, mira el ítems a Zotero Independent.
+connector.standaloneOpen=No es pot accedir a la base de dades perquè el Zotero Independent està obert. Visualitzeu el elements al Zotero Independent.
 
 firstRunGuidance.saveIcon=Zotero pot reconèixer una referència en aquesta pàgina. Fes clic en aquesta icona a la barra d'adreces per desar la referència a la teva biblioteca de Zotero.
 firstRunGuidance.authorMenu=Zotero també permet especificar editors i traductors. Pots convertir un autor en un editor o traductor mitjançant la selecció d'aquest menú.
diff --git a/chrome/locale/cs-CZ/zotero/about.dtd b/chrome/locale/cs-CZ/zotero/about.dtd
index 5245435561..bd7342c2ac 100644
--- a/chrome/locale/cs-CZ/zotero/about.dtd
+++ b/chrome/locale/cs-CZ/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Zvláštní poděkování:">
 <!ENTITY zotero.about.close "Zavřít">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Další spolupracovníci a poděkování...">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/cs-CZ/zotero/preferences.dtd b/chrome/locale/cs-CZ/zotero/preferences.dtd
index aa092501d9..75a5d046b3 100644
--- a/chrome/locale/cs-CZ/zotero/preferences.dtd
+++ b/chrome/locale/cs-CZ/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Původní:">
 <!ENTITY zotero.preferences.items "položky">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Obecné">
 
@@ -38,7 +39,7 @@
 <!ENTITY zotero.preferences.groups.childNotes "dceřiné poznámky">
 <!ENTITY zotero.preferences.groups.childFiles "dceřiné snímky a importované soubory">
 <!ENTITY zotero.preferences.groups.childLinks "dceřiné odkazy">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "štítky">
 
 <!ENTITY zotero.preferences.openurl.caption "OpenURL">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "K synchronizaci příloh v Mojí knihovně použít">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Synchronizovat přílohy ve skupinových knihovnách pomocí úložiště Zotera">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Použitím úložiště Zotera souhlasíte s">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "podmínkami a ujednáními">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Plně synchronizovat se Zotero Serverem">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Sloučit lokální data Zotera s daty ze synchronizačního serveru (nebude se brát v potaz historie synchronizací).">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Obnovit ze Zotero Serveru">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Vymazat všechna data na serveru a přepsat je lokálními daty Zotera.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Resetovat historii synchronizace souborů">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Vynutit kontrolu, zda jsou všechny lokální soubory příloh uloženy v úložišti.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reset...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Název">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Aktualizováno">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Získat další styly...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Klávesové zkratky">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Nějaký řetězec">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Pokročilé">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Najít">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Správce mechanismu pro vyhledávání článků">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Vybrat...">
 <!ENTITY zotero.preferences.dataDir.reveal "Ukázat Datový adresář">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Údržba databáze">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Zkontrolovat integritu databáze">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Resetovat překladače a styly...">
diff --git a/chrome/locale/cs-CZ/zotero/standalone.dtd b/chrome/locale/cs-CZ/zotero/standalone.dtd
index 0d622c3d32..f8ee19be5e 100644
--- a/chrome/locale/cs-CZ/zotero/standalone.dtd
+++ b/chrome/locale/cs-CZ/zotero/standalone.dtd
@@ -12,12 +12,12 @@
 
 <!ENTITY fileMenu.label "Soubor">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "Uložit...">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
+<!ENTITY pageSetupCmd.label "Nastavení stránky...">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "Tisk...">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "U">
 <!ENTITY closeCmd.label "Zavřít">
diff --git a/chrome/locale/cs-CZ/zotero/zotero.dtd b/chrome/locale/cs-CZ/zotero/zotero.dtd
index d0d95ccc11..b2a32b9585 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.dtd
+++ b/chrome/locale/cs-CZ/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Editovat">
 <!ENTITY zotero.general.delete "Smazat">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Záznam o chybách může obsahovat informace nesouvisející se Zoterem.">
 <!ENTITY zotero.errorReport.submissionInProgress "Čekejte, prosím, dokud nebude zpráva o chybách odeslána.">
 <!ENTITY zotero.errorReport.submitted "Zpráva o chybách byla odeslána.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Prosím, napište zprávu do Zotero fóra (forums.zotero.org). Napište ID hlášení, popis problému a postupné kroky k jeho reprodukování.">
 <!ENTITY zotero.errorReport.notReviewed "Chybová hlášení nejsou zpracovávána, dokud nejsou nahlášena do fóra.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Nainstalovali jste novou verzi Zotera.">
 <!ENTITY zotero.upgrade.upgradeRequired "Databáze vašeho Zotera musí být aktualizována, aby mohla pracovat s novou verzí.">
 <!ENTITY zotero.upgrade.autoBackup "Vaše existující databáze bude zálohována předtím, než budou provedeny jakékoli změny.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Práva">
 <!ENTITY zotero.items.dateAdded_column "Přidáno dne">
 <!ENTITY zotero.items.dateModified_column "Upraveno dne">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Ukázat v knihovně">
 <!ENTITY zotero.items.menu.attach.note "Přidat poznámku">
@@ -68,10 +86,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Obnovit do knihovny">
 <!ENTITY zotero.items.menu.duplicateItem "Duplikovat vybranou položku">
-<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+<!ENTITY zotero.items.menu.mergeItems "Sloučit položky...">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
-<!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "Vyberte verzi položky, jež bude použita jako hlavní položka:">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "Vyberte pole z jiných verzí položky, která se mají zachovat:">
 
 <!ENTITY zotero.toolbar.newItem.label "Nová položka">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Více">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Převést text">
 <!ENTITY zotero.item.textTransform.titlecase "Velká Písmena">
 <!ENTITY zotero.item.textTransform.sentencecase "Velké první písmeno">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nová poznámka">
 <!ENTITY zotero.toolbar.note.standalone "Nová samostatná poznámka">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Vybrat viditelné">
 <!ENTITY zotero.tagSelector.clearVisible "Zrušit výběr viditelných">
 <!ENTITY zotero.tagSelector.clearAll "Zrušit výběr všech">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Přejmenovat štítek...">
 <!ENTITY zotero.tagSelector.deleteTag "Smazat štítek...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Do políčka níže vložte ISBN, DOI nebo PMID, podle kterého chcete vyhledávat.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Označit položky">
 <!ENTITY zotero.selectitems.intro.label "Označte položky, které byste rádi přidali do Vaší knihovny">
@@ -132,9 +159,9 @@
 
 <!ENTITY zotero.bibliography.title "Vytvořit bibliografii">
 <!ENTITY zotero.bibliography.style.label "Citační styl:">
-<!ENTITY zotero.bibliography.outputMode "Output Mode:">
-<!ENTITY zotero.bibliography.bibliography "Bibliography">
-<!ENTITY zotero.bibliography.outputMethod "Output Method:">
+<!ENTITY zotero.bibliography.outputMode "Výstupní režim:">
+<!ENTITY zotero.bibliography.bibliography "Bibligrafie">
+<!ENTITY zotero.bibliography.outputMethod "Výstupní metoda:">
 <!ENTITY zotero.bibliography.saveAsRTF.label "Uložit jako RTF">
 <!ENTITY zotero.bibliography.saveAsHTML.label "Uložit jako HTML">
 <!ENTITY zotero.bibliography.copyToClipboard.label "Kopírovat do schránky">
@@ -143,7 +170,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Vlastnosti dokumentu">
 <!ENTITY zotero.integration.addEditCitation.title "Přidat/Upravit citaci">
 <!ENTITY zotero.integration.editBibliography.title "Upravit bibliografii">
-<!ENTITY zotero.integration.quickFormatDialog.title "Quick Format Citation">
+<!ENTITY zotero.integration.quickFormatDialog.title "Rychlý formát citace">
 
 <!ENTITY zotero.progress.title "Postup">
 
@@ -162,7 +189,7 @@
 <!ENTITY zotero.citation.suppressAuthor.label "Potlačit autora">
 <!ENTITY zotero.citation.prefix.label "Předpona:">
 <!ENTITY zotero.citation.suffix.label "Přípona:">
-<!ENTITY zotero.citation.editorWarning.label "Warning: If you edit a citation in the editor it will no longer update to reflect changes in your database or the citation style.">
+<!ENTITY zotero.citation.editorWarning.label "Upozornění: Pokud upravíte citaci v editoru, nebude se nadále aktualizovat na základě změn v databázi, nebo citačního stylu.">
 
 <!ENTITY zotero.richText.italic.label "Kurzíva">
 <!ENTITY zotero.richText.bold.label "Tučné">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Nezaškrtnuté štítky nebudou uloženy.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Štítky budou smazány ze všech položek.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Rozpoznána proxy">
 <!ENTITY zotero.proxy.recognized.warning "Přidávejte pouze proxy ze stránek vaší knihovny, školy nebo zaměstnání.">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Přidání jiných proxy může umožnit škodlivým stránkám vydávat se za stránky, kterým věříte.">
diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties
index b1c0dac3a0..4ba909bb57 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.properties
+++ b/chrome/locale/cs-CZ/zotero/zotero.properties
@@ -11,9 +11,12 @@ general.restartRequiredForChange=Aby se změna projevila, musí být restartová
 general.restartRequiredForChanges=Aby se změny projevily, musí být restartován %S.
 general.restartNow=Restartovat ihned
 general.restartLater=Restartovat později
-general.restartApp=Restart %S
+general.restartApp=Restartovat %S
 general.errorHasOccurred=Vyskytla se chyba.
 general.unknownErrorOccurred=Nastala neznámá chyba.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Prosím, restartujte Firefox.
 general.restartFirefoxAndTryAgain=Prosím, restartujte Firefox a zkuste to znovu.
 general.checkForUpdate=Zkontrolovat, jestli nejsou k dispozici aktualizace
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Pro více informací se podívejte na %S
 general.enable=Povolit
 general.disable=Zakázat
 general.remove=Odstranit
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Otevřít dokumentaci
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Právě probíhá operace se Zoterem.
 general.operationInProgress.waitUntilFinished=Počkejte prosím, dokud neskončí.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Stisknutím %S pošlete hlášení o chybách vývoj
 errorReport.stepsToReproduce=Kroky k zopakování:
 errorReport.expectedResult=Očekávaný výsledek:
 errorReport.actualResult=Dosažený výsledek:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Datový adresář aplikace Zotero nebyl nalezen.
 dataDir.previousDir=Předchozí adresář:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Použít adresář profilu aplikace Firefox
 dataDir.selectDir=Vybrat Datový adresář aplikace Zotero
 dataDir.selectedDirNonEmpty.title=Adresář není prázdný
 dataDir.selectedDirNonEmpty.text=Adresář, který jste vybrali, není prázdný a zřejmě není Datovým adresářem aplikace Zotero.\n\nChcete přesto vytvořit soubory aplikace Zotero v tomto adresáři?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Nalezená existující knihovna Zotera
 dataDir.standaloneMigration.description=Toto je zřejmě první případ, kdy používáte %1$S. Přejete si, aby bylo vaše nastavení z %2$S importováno do %1$S a aby se použil existující datový adresář?
 dataDir.standaloneMigration.multipleProfiles=%1$S bude sdílet svůj datový adresář s naposledy použitým profilem.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Nové Uložené hledání
 pane.collections.savedSearchName=Zadejte jméno pro toto Uložené hledání:
 pane.collections.rename=Přejmenovat kolekci:
 pane.collections.library=Moje knihovna
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Koš
 pane.collections.untitled=Nepojmenované
 pane.collections.unfiled=Nezařazené položky
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Jste si jisti, že chcete smazat tento štítek?
 pane.tagSelector.numSelected.none=vybráno: 0 štítků
 pane.tagSelector.numSelected.singular=vybrán 1 štítek
 pane.tagSelector.numSelected.plural=vybráno: %S štítků
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Nahrávám seznam položek...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Přesunout do Koše
 pane.items.trash=Jste si jisti, že chcete přesunout vybranou položku do Koše?
 pane.items.trash.multiple=Jste si jisti, že chcete přesunout vybranou položku do Koše?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=vybráno %S položek
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Změnit typ položky
 pane.item.changeType.text=Jste si jisti, že chcete změnit typ této položky?\n\nNásledující pole budou ztracena:
@@ -188,8 +227,8 @@ pane.item.defaultLastName=poslední
 pane.item.defaultFullName=plné jméno
 pane.item.switchFieldMode.one=Přepnout na jedno pole
 pane.item.switchFieldMode.two=Přepnout na více polí
-pane.item.creator.moveUp=Move Up
-pane.item.creator.moveDown=Move Down
+pane.item.creator.moveUp=Posunout nahoru
+pane.item.creator.moveDown=Posunout dolů
 pane.item.notes.untitled=Nepojmenovaná poznámka
 pane.item.notes.delete.confirm=Jste si jistý, že chcete smazat tuto poznámku?
 pane.item.notes.count.zero=%S poznámek:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S příloh:
 pane.item.attachments.count.singular=%S příloha:
 pane.item.attachments.count.plural=%S příloh:
 pane.item.attachments.select=Vyberte soubor
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=klikněte zde
-pane.item.tags=Štítky:
 pane.item.tags.count.zero=%S štítků:
 pane.item.tags.count.singular=%S štítek:
 pane.item.tags.count.plural=%S štítků:
 pane.item.tags.icon.user=Uživatelem přidaný štítek
 pane.item.tags.icon.automatic=Automaticky přidaný štítek
-pane.item.related=Související:
 pane.item.related.count.zero=%S souvisejících:
 pane.item.related.count.singular=%S související:
 pane.item.related.count.plural=%S souvisejících:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Do aktuálně vybrané kolekce nemůžete
 ingester.saveToZotero=Uložit do Zotera
 ingester.saveToZoteroUsing=Uložit do Zotera pomocí "%S"
 ingester.scraping=Ukládá se položka...
+ingester.scrapingTo=Saving to
 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í.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=Vždy povolit pro tuto stránku.
 
 ingester.importFile.title=Importovat soubor
 ingester.importFile.text=Chcete importovat soubor "%S"?\n\nPoložky budou přidány do nové kolekce.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Provádí se vyhledávání...
 ingester.lookup.error=Během vyhledávání této položky došlo k chybě.
@@ -441,20 +483,33 @@ db.dbRestoreFailed=Zotero databáze '%S' byla pravděpodobně porušena a pokus
 db.integrityCheck.passed=V databázi nebyly nalezeny žádné chyby.
 db.integrityCheck.failed=V Zotero databázi byly nalezeny chyby!
 db.integrityCheck.dbRepairTool=Můžete použít nástroj pro opravu databáze z http://zotero.org/utils/dbfix a pokusit se opravit tyto chyby
-db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
-db.integrityCheck.appRestartNeeded=%S will need to be restarted.
-db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
-db.integrityCheck.errorsFixed=The errors in your Zotero database have been corrected.
-db.integrityCheck.errorsNotFixed=Zotero was unable to correct all the errors in your database.
-db.integrityCheck.reportInForums=You can report this problem in the Zotero Forums.
+db.integrityCheck.repairAttempt=Zotero se může pokusit tyto chyby opravit.
+db.integrityCheck.appRestartNeeded=Je potřeba restartovat %S
+db.integrityCheck.fixAndRestart=Opravit chyby a restartovat %S
+db.integrityCheck.errorsFixed=Chyby ve vaší Zotero databázi byly opraveny.
+db.integrityCheck.errorsNotFixed=Zoteru se nepodařilo opravit všechny chyby ve vaší databázi.
+db.integrityCheck.reportInForums=Můžete nahlásit problém na fórech Zotero
 
 zotero.preferences.update.updated=Aktualizováno
 zotero.preferences.update.upToDate=Aktuální
 zotero.preferences.update.error=Chyba
-zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when possible
+zotero.preferences.launchNonNativeFiles=Pokud je to možné, otevírat soubory PDF a další přímo v %S
 zotero.preferences.openurl.resolversFound.zero=nalezeno %S resolverů
 zotero.preferences.openurl.resolversFound.singular=nalezen %S resolver
 zotero.preferences.openurl.resolversFound.plural=nalezeno %S resolverů
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Znovu vytvořit celý index
 zotero.preferences.search.rebuildWarning=Chcete znovu vytvořit celý index? To může chvíli trvat.\n\nPro indexování pouze těch položek, které nebyly indexovány, použijte %S.
 zotero.preferences.search.clearIndex=Vymazat index
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Všechny nové nebo upr
 zotero.preferences.advanced.resetStyles=Resetovat styly
 zotero.preferences.advanced.resetStyles.changesLost=Všechny nové nebo upravené styly budou ztraceny.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Následující soubory v cílovém adresáři již existují a nebyly zkopírovány:
 dragAndDrop.filesNotFound=Následující soubory nebyly nalezeny a nemohly být zkopírovány:
 
@@ -500,7 +559,8 @@ fileInterface.import=Import
 fileInterface.export=Export
 fileInterface.exportedItems=Exportované položky
 fileInterface.imported=Importované
-fileInterface.fileFormatUnsupported=Žádné překladače nemohly být nalezeny pro daný soubor.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Nepojmenovaná bibliografie
 fileInterface.bibliographyHTMLTitle=Bibliografie
 fileInterface.importError=Při importu vybraného souboru došlo k chybě. Přesvědčte se, prosím, že je soubor v pořádku, a zkuste import znovu.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Položky, které jste vybrali, neobsahují žád
 fileInterface.bibliographyGenerationError=Při generování Vaší bibliografie nastala chyba. Zkuste to prosím znovu.
 fileInterface.exportError=Při pokusu o export vybraného souboru nastala chyba.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Mód pokročilého vyhledávání - zmáčkněte Enter pro vyhledávání.
 searchInProgress=Probíhá vyhledávání - prosím, čekejte.
 
@@ -556,7 +620,7 @@ fulltext.indexState.partial=Částečný
 
 exportOptions.exportNotes=Exportovat poznámky
 exportOptions.exportFileData=Exportovat soubory
-exportOptions.useJournalAbbreviation=Use Journal Abbreviation
+exportOptions.useJournalAbbreviation=Použí zkratku časopisu
 charset.UTF8withoutBOM=Unicode (UTF-8 bez BOM)
 charset.autoDetect=(automaticky detekovat)
 
@@ -572,8 +636,8 @@ citation.multipleSources=Více zdrojů...
 citation.singleSource=Jednotlivý zdroj...
 citation.showEditor=Zobrazit editor...
 citation.hideEditor=Skrýt editor...
-citation.citations=Citations
-citation.notes=Notes
+citation.citations=Citace
+citation.notes=Poznámky
 
 report.title.default=Zotero report
 report.parentItem=Rodičovská položka:
@@ -613,6 +677,7 @@ integration.cited.loading=Nahrávají se citované položky...
 integration.ibid=tamtéž
 integration.emptyCitationWarning.title=Prázdná citace
 integration.emptyCitationWarning.body=Citace, kterou jste specifikovali, by byla podle aktuálně zvoleného stylu prázdná. Jste si jisti, že ji chcete přidat?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Tato verze pluginu pro textové procesory ($INTEGRATION_VERSION) není kompatibilní s aktuálně nainstalovanou verzí rozšíření Zotero pro Firefox (%1$S). Ujistěte se prosím, že používáte nejnovější verze obou komponent.
 integration.error.incompatibleVersion2=Zotero %1$S vyžaduje %2$S %3$S nebo novější. Prosím, stáhněte nejnovější verzi %2$S ze zotero.org.
@@ -643,14 +708,22 @@ integration.citationChanged=Citace byla upravena poté, co ji Zotero nageneroval
 integration.citationChanged.description=Kliknutím na "Ano" zabráníte Zoteru aktualizovat tuto citaci když přidáte další citace, přepnete styly, nebo upravíte odkaz, na které odkazuje. Kliknutím na "Ne" smažete vaše změny.
 integration.citationChanged.edit=Citace byla po vygenerování Zoterem ručně upravena. Editování smaže vaše úpravy. Přejete si pokračovat?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Instalovat styl "%1$S" z %2$S?
 styles.updateStyle=Aktualizovat existující styl "%1$S" stylem "%2$S" z %3$S?
 styles.installed=Styl "%S" byl úspěšně nainstalován.
 styles.installError=%S zřejmě není platný soubor stylu.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S odkazuje na neplatný nebo neexistující CSL soubor %2$S.
 styles.deleteStyle=Jste si jisti, že chcete smazat styl "%1$S"?
 styles.deleteStyles=Jste si jisti, že chcete smazat vybrané styly?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Zrušit synchronizaci
 sync.openSyncPreferences=Otevřít nastavení synchronizace
 sync.resetGroupAndSync=Resetovat Skupinu a synchronizovat
@@ -660,8 +733,10 @@ sync.remoteObject=Vzdálený objekt
 sync.mergedObject=Sloučený objekt
 
 sync.error.usernameNotSet=Uživatelské jméno není nastaveno
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Heslo není nastaveno
 sync.error.invalidLogin=Neplatné uživatelské jméno nebo heslo
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Prosím zadejte heslo.
 sync.error.loginManagerCorrupted1=Zotero nemůže přistoupit k vašim přihlašovacím údajům. Pravděpodobnou příčinou je poškozená databáze přihlašovacích údajů v aplikaci Firefox.
 sync.error.loginManagerCorrupted2=Zavřete Firefox, proveďte zálohu a smažte singons.* ze svého profilu ve Firefoxu. Poté znovu vložte své přihlašovací údaje do panelu Sync v Nastavení Zotera.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Pokud budete pokračovat, vaše kopie skupiny bude r
 sync.error.copyChangedItems=Pokud chcete zkopírovat své soubory jinam, nebo požádat administrátora skupiny o práva pro zápis, zrušte synchronizaci.
 sync.error.manualInterventionRequired=Automatická synchronizace způsobila konflikt, který vyžaduje ruční zásah uživatele.
 sync.error.clickSyncIcon=Klikněte na ikonu synchronizace pro provedení manuální synchronizace.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Zatím nesynchronizováno
 sync.status.lastSync=Poslední synchronizace:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Nahrávám data na synchronizační server
 sync.status.uploadAccepted=Nahraná data přijata - čeká se na synchronizační server
 sync.status.syncingFiles=Synchronizuji soubory
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB zbývá
 sync.storage.filesRemaining=%1$S/%2$S soubory
 sync.storage.none=Žádný
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Lokální soubor
 sync.storage.remoteFile=Vzdálený soubor
 sync.storage.savedFile=Uložený soubor
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Konfigurace serveru ověřeno
 sync.storage.fileSyncSetUp=Nastavení synchronizace bylo úspěšně nastaveno.
 sync.storage.openAccountSettings=Otevřít nastavení účtu
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Nepodařilo se dosáhnout serveru %S.
 sync.storage.error.permissionDeniedAtAddress=Nemáte práva vytvořit Zotero adresář na následující adrese:
 sync.storage.error.checkFileSyncSettings=Prosím, zkontrolujte své nastavení synchronizace, nebo kontaktujte administrátora vašeho serveru.
 sync.storage.error.verificationFailed=Ověření %S selhalo. Zkontrolujte vaše nastavení synchronizace souborů v panelu Sync v Nastavení Zotera.
 sync.storage.error.fileNotCreated=Nepodařilo se vytvořit soubor '%S' v uložném adresáři Zotera.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=V Zotero skupině '%S' už nemáte právo editace souborů a soubory, které jste přidali či editovali, nemohou být synchronizovány se serverem.
 sync.storage.error.copyChangedItems=Pokud byste chtěli uložit kopii změněných položek a souborů jinam, zrušte teď synchronizaci.
 sync.storage.error.fileUploadFailed=Nahrání souborů se nezdařilo.
 sync.storage.error.directoryNotFound=Adresář nebyl nalezen
 sync.storage.error.doesNotExist=%S neexistuje.
 sync.storage.error.createNow=Chcete ho teď vytvořit?
-sync.storage.error.webdav.enterURL=Prosím vložte WebDAV URL.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S není platná WebDAV URL.
 sync.storage.error.webdav.invalidLogin=WebDAV server nepřijal uživatelské jméno a heslo, které jste zadali.
 sync.storage.error.webdav.permissionDenied=Nemáte práva přístupu pro %S na WebDAV serveru.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=Chyba SSL spojení při připojová
 sync.storage.error.webdav.loadURLForMoreInfo=Nahrajte vaší WebDAV URL do prohlížeče pro více informací.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Více informací najdete v dokumentaci překonání certifikátu (certificate override documentation).
 sync.storage.error.webdav.loadURL=Načíst WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Dosáhli jste vaší kvóty v Zotero úložišti souborů. Některé soubory nebudou nahrány. Ostatní data Zotera se budou i nadále synchronizovat se serverem.
 sync.storage.error.zfs.personalQuotaReached2=Pro zobrazení dalších možností ukládání použijte nastavení účtu na zotero.org.
 sync.storage.error.zfs.groupQuotaReached1=Skupina '%S' dosáhla její kvóty v Zotero úložišti souborů. Některé soubory nebyly nahrány. Ostatní data Zotera se budou i nadále synchronizovat se serverem.
 sync.storage.error.zfs.groupQuotaReached2=Vlastník skupiny může zvětšit kapacitu úložiště skupiny pomocí sekce 'nastavení úložiště' na zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Uložit štítek
 sync.longTagFixer.saveTags=Uložit štítky
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Není možné přečíst text z PDF.
 recognizePDF.noMatches=Nebyly nalezeny odpovídající reference.
 recognizePDF.fileNotFound=Soubor nenalezen.
 recognizePDF.limit=Dosažen maximální počet dotazů. Zkuste to později.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Získávání metadat bylo dokončeno.
 recognizePDF.close.label=Zavřít
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Vyberte umístění, do kterého bude uložen naformátovaný soubor
 rtfScan.scannedFileSuffix=(Prohledán)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Vyhledání se nezdařilo
 lookup.failure.description=Zotero nedokázalo najít záznam odpovídající specifikovanému identifikátoru. Prosím ověřte správnost identifikátoru a zkuste to znovu.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Zobrazit online
 locate.online.tooltip=Přejít na tuto položku online
diff --git a/chrome/locale/da-DK/zotero/about.dtd b/chrome/locale/da-DK/zotero/about.dtd
index 50e6e5913a..475029cf07 100644
--- a/chrome/locale/da-DK/zotero/about.dtd
+++ b/chrome/locale/da-DK/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Særlig tak til:">
 <!ENTITY zotero.about.close "Luk">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Flere anerkendelser">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/da-DK/zotero/preferences.dtd b/chrome/locale/da-DK/zotero/preferences.dtd
index 6ea832e7c7..ad473bbc7e 100644
--- a/chrome/locale/da-DK/zotero/preferences.dtd
+++ b/chrome/locale/da-DK/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Default:">
 <!ENTITY zotero.preferences.items "Elementer">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Generelt">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Synkroniser Vedhæftninger i Mit Bibliotek ved hjælp af">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Synkroniser Vedhæftninger i gruppe-biblioteker ved hjælp af Zoteros online-lager">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Når du anvender Zoteros online-lager, er du forpligtet på dets">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "betingelser">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Fuld synkronisering med Zotero Server">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Flet de lokale Zotero-data med data fra synkroniserings-serveren uanset deres synkroniserings-historik.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Gendan fra Zotero Server">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Slet alle server-data og overskriv med lokale data fra Zotero.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Nulstil historik for fil-synkronisering">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Gennemtving et tjek af lager-serveren for alle lokale Vedhæftninger">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Nulstil...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titel">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Opdateret">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Hent yderligere formater">
 
 <!ENTITY zotero.preferences.prefpane.keys "Genvejs-taster">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Enhver tegnstreng">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avanceret">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Lokaliser">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Håndtering af søgemaskiner for artikler">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Vælg...">
 <!ENTITY zotero.preferences.dataDir.reveal "Vis data-mappen">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Vedligeholdelse af databasen">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Tjek databasens gyldighed">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset &quot;oversættere&quot; og formater...">
diff --git a/chrome/locale/da-DK/zotero/standalone.dtd b/chrome/locale/da-DK/zotero/standalone.dtd
index 5d49f4eddd..1b5cd7fec5 100644
--- a/chrome/locale/da-DK/zotero/standalone.dtd
+++ b/chrome/locale/da-DK/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Luk">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
diff --git a/chrome/locale/da-DK/zotero/zotero.dtd b/chrome/locale/da-DK/zotero/zotero.dtd
index f1a9a4c7e0..bf3f912fe5 100644
--- a/chrome/locale/da-DK/zotero/zotero.dtd
+++ b/chrome/locale/da-DK/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Rediger">
 <!ENTITY zotero.general.delete "Slet">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Logfilen for fejl kan indeholde meddelelser der ikke har med Zotero at gøre.">
 <!ENTITY zotero.errorReport.submissionInProgress "Vent venligst mens fejlrapporten registreres.">
 <!ENTITY zotero.errorReport.submitted "Din fejlrapport er registreret.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Læg venligst en besked på Zoteros fora (forums.zotero.org) med dette Rapport-ID, en beskrivelse af problemet og det der får problemet til at opstå.">
 <!ENTITY zotero.errorReport.notReviewed "Fejlrapporter bliver ikke læst medmindre der henvises til dem i Zoteros fora.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Du har installeret en ny version af Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Din Zotero-database skal opgraderes for at virke med den seneste version.">
 <!ENTITY zotero.upgrade.autoBackup "Din nuværende database vil blive sikkerhedskopieret, inden der foretages ændringer.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Rettigheder">
 <!ENTITY zotero.items.dateAdded_column "Tilføjet den">
 <!ENTITY zotero.items.dateModified_column "Ændret den">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Vis i bibliotek">
 <!ENTITY zotero.items.menu.attach.note "Tilføj note">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transformer tekst">
 <!ENTITY zotero.item.textTransform.titlecase "Betydende ord med stort ">
 <!ENTITY zotero.item.textTransform.sentencecase "Første bogstav med stort">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Ny note">
 <!ENTITY zotero.toolbar.note.standalone "Ny selvstændig note">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Vælg de synlige">
 <!ENTITY zotero.tagSelector.clearVisible "Fravælg de synlige">
 <!ENTITY zotero.tagSelector.clearAll "Fravælg alle">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Omdøb mærkaten...">
 <!ENTITY zotero.tagSelector.deleteTag "Slet mærkaten...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Indtast ISBN, DOI eller PMID for opslag nedenfor.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Vælg elementer">
 <!ENTITY zotero.selectitems.intro.label "Vælg de elementer, du ønsker at tilføje til dit bibliotek">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Mærkater, der ikke er markeret, vil ikke blive gemt.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Mærkatet vil blive fjernet fra alle elementer.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Proxy registreret">
 <!ENTITY zotero.proxy.recognized.warning "Tilføj kun proxyer, der er knyttet til dit biblioteks, din institutions eller din virksomheds web-sted">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Hvis du tilføjer andre proxyer, kan ondsindede web-steder optræde som steder du stoler på.">
diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties
index 3bf96d152a..0b3036775f 100644
--- a/chrome/locale/da-DK/zotero/zotero.properties
+++ b/chrome/locale/da-DK/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Genstart senere
 general.restartApp=Restart %S
 general.errorHasOccurred=Der er opstået en fejl.
 general.unknownErrorOccurred=Der er opstået en ukendt fejl.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Genstart %S.
 general.restartFirefoxAndTryAgain=Genstart %S og prøv igen.
 general.checkForUpdate=Tjek om der er en opdatering
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Se %S for nærmere oplysninger.
 general.enable=Slå til
 general.disable=Slå fra
 general.remove=Fjern
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=En Zotero-operation er ved at blive udført.
 general.operationInProgress.waitUntilFinished=Vent venligst til den er færdig.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Tryk %S for at sende en fejlmeldining til holdet bag
 errorReport.stepsToReproduce=Følgende skridt kan genskabe situationen:
 errorReport.expectedResult=Forventet resultat:
 errorReport.actualResult=Faktisk resultat:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Zoteros datamappe kunne ikke findes.
 dataDir.previousDir=Tidligere mappe:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Anvend Firefox' profilmappe
 dataDir.selectDir=Vælg en datamappe til Zotero
 dataDir.selectedDirNonEmpty.title=Mappen er ikke tom
 dataDir.selectedDirNonEmpty.text=Mappen du oprettede er ikke tom og synes ikke at være en datamappe til Zotero.\n\nØnsker du at oprette Zotero-filer i denne mappe alligevel?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Der er fundet et allerede eksisterende Zotero-Bibliotek.
 dataDir.standaloneMigration.description=Det ser ud til at være første gang du bruger %1$S. Skal %1$S importere dine valg fra %2$S og bruge din nuværende datamappe? 
 dataDir.standaloneMigration.multipleProfiles=%1$S vil dele sin datamappe med den sidst anvende profil.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Ny gemt Søgning
 pane.collections.savedSearchName=Giv den gemte Søgning et navn:
 pane.collections.rename=Giv Samlingen et nyt navn:
 pane.collections.library=Mit Bibliotek
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Papirkurv
 pane.collections.untitled=Uden navn
 pane.collections.unfiled=Elementer som ikke er gemt.
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Er du sikker på at du vil slette dette tag?\n\n
 pane.tagSelector.numSelected.none=0 Tags er valgt
 pane.tagSelector.numSelected.singular=%S Tag valgt
 pane.tagSelector.numSelected.plural=%S Tags er valgt.
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Henter listen med Elementer...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Læg Elementerne i papirkurven
 pane.items.trash=Er du sikker på at du vil lægge disse Elementer i papirkurven?
 pane.items.trash.multiple=Er du sikker på at du vil lægge disse Elementer i papirkurven?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S Elementer valgt
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Henfør Elementet til en ny type
 pane.item.changeType.text=Er du sikker på at du vil ændre Elementets Type?\n\nFølgende felter går tabt:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S Vedhæftninger.
 pane.item.attachments.count.singular=%S Vedhæftning:
 pane.item.attachments.count.plural=%S Vedhæftninger:
 pane.item.attachments.select=Vælg en fil
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=Klik her
-pane.item.tags=Tags:
 pane.item.tags.count.zero=%S Tags:
 pane.item.tags.count.singular=%S Tag:
 pane.item.tags.count.plural=%S Tags:
 pane.item.tags.icon.user=Tag tilføjet af bruger
 pane.item.tags.icon.automatic=Tag tilføjet automatisk
-pane.item.related=Relateret:
 pane.item.related.count.zero=%S relaterede:
 pane.item.related.count.singular=%S relateret:
 pane.item.related.count.plural=%S relaterede:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Gem i Zotoro
 ingester.saveToZoteroUsing=Gem i Zotero med brug af "%S"
 ingester.scraping=Gemmer Element...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Elementet er gemt
 ingester.scrapeError=Elementet kunne ikke gemmes.
 ingester.scrapeErrorDescription=En fejl opstod under forsøget på at gemme Elementet. Tjek %S for mere information.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=Brug det altid for dette sted.
 
 ingester.importFile.title=Import-fil
 ingester.importFile.text=Vil du importere filen "%S"?\n\nElementer bliver placeret i en ny Samling.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Foretager opslag...
 ingester.lookup.error=Der opstod en fejl under forsøget på opslag for Elementet.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S "resolvere" fundet
 zotero.preferences.openurl.resolversFound.singular=%S "resolver" fundet
 zotero.preferences.openurl.resolversFound.plural=%S "resolvere" fundet
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Genopbyg indeks
 zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
 zotero.preferences.search.clearIndex=Ryd indeks
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Alle nye eller revidere
 zotero.preferences.advanced.resetStyles=Gendan de oprindelige bibliografiske formater
 zotero.preferences.advanced.resetStyles.changesLost=Alle nye eller reviderede bibliografiske formater vil gå tabt.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Følgende filer fandtes allerede i mål-mappen og blev ikke kopieret:
 dragAndDrop.filesNotFound=Følgende filer kunne ikke findes og kunne derfor ikke kopieres:
 
@@ -500,7 +559,8 @@ fileInterface.import=Import
 fileInterface.export=Eksport
 fileInterface.exportedItems=Eksporterede Elementer
 fileInterface.imported=Importeret
-fileInterface.fileFormatUnsupported=Ingen "oversætter" kunne findes for den pågældende fil
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Referenceliste uden navn
 fileInterface.bibliographyHTMLTitle=Rererenceliste
 fileInterface.importError=Der opstod en fejl under import af den valgte fil. Tjek om filen er i et gyldigt format og ikke beskadet. Prøv så igen.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=De elementer du valgt indeholder ingen reference
 fileInterface.bibliographyGenerationError=En fejl opstod under dannelsen af referencelisten. Prøv igen.
 fileInterface.exportError=En fejl opstod under eksport af den valgte fil.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Avanceret søgning - tryk Retur for at sætte den igang.
 searchInProgress=Søgning pågår - vent venligst-
 
@@ -613,11 +677,12 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid.
 integration.emptyCitationWarning.title=Tom henvisning
 integration.emptyCitationWarning.body=Den henvisning du har bedt om vil være tom i det aktuelle bibliografiske format. Er du sikker på at du vil tilføje den?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Error
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Zotero experienced an error updating your document.
 integration.error.mustInsertCitation=Du må indsætte en henvisng for at kunne udføre denne handling.
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
@@ -643,14 +708,22 @@ integration.citationChanged=Du har ændret denne henvisning siden Zotero indsatt
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Install style "%1$S" from %2$S?
 styles.updateStyle=Vil du opdatere det nuværende format "%1$S" med "%2$S" fra %3$S?
 styles.installed=The style "%S" was installed successfully.
-styles.installError=%S does not appear to be a valid style file.
+styles.installError="%S" is not a valid style file.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 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?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancel Sync
 sync.openSyncPreferences=Indstillinger for Open Sync...
 sync.resetGroupAndSync=Reset Group and Sync
@@ -660,18 +733,55 @@ sync.remoteObject=Remote Object
 sync.mergedObject=Merged Object
 
 sync.error.usernameNotSet=Username not set
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Password not set
 sync.error.invalidLogin=Invalid username or password
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 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 %S.
+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 '%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.error.manualInterventionRequired=Conflicts have suspended automatic syncing.
+sync.error.clickSyncIcon=Click the sync icon to resolve them.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Not yet synced
 sync.status.lastSync=Last sync:
@@ -682,9 +792,12 @@ 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.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB remaining
 sync.storage.filesRemaining=%1$S/%2$S files
 sync.storage.none=None
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Local File
 sync.storage.remoteFile=Remote File
 sync.storage.savedFile=Saved File
@@ -692,17 +805,23 @@ sync.storage.serverConfigurationVerified=Server configuration verified
 sync.storage.fileSyncSetUp=File sync is successfully set up.
 sync.storage.openAccountSettings=Open Account Settings
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=The server %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=%S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
 sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=You no longer have file editing access to the Zotero group '%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=%S findes ikke.
 sync.storage.error.createNow=Do you want to create it now?
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
 sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1=The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2=The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Save Tag
 sync.longTagFixer.saveTags=Save Tags
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Could not read text from PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=File not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Luk
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(skannet)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/de/zotero/about.dtd b/chrome/locale/de/zotero/about.dtd
index dcd623b2a4..638765fb35 100644
--- a/chrome/locale/de/zotero/about.dtd
+++ b/chrome/locale/de/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Besonderer Dank gebührt:">
 <!ENTITY zotero.about.close "Schließen">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Außerdem danken wir:">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/de/zotero/preferences.dtd b/chrome/locale/de/zotero/preferences.dtd
index 024c62af22..2c6d733426 100644
--- a/chrome/locale/de/zotero/preferences.dtd
+++ b/chrome/locale/de/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Standardeinstellungen:">
 <!ENTITY zotero.preferences.items "Einträge">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Allgemein">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Angehängte Dateien in Meine Bibliothek synchronisieren mit:">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Angehängte Dateien in Gruppen-Bibliotheken mit Zotero Storage synchronisieren">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "Über die Dateisynchronisierung">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Wenn Sie Zotero Storage benutzen, erklären Sie sich einverstanden mit den">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "allgemeinen Geschäftsbedingungen">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Komplette Synchronisierung mit Zotero-Server">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Lokale Zotero-Daten mit Daten vom Sync-Server zusammenführen, ohne die Sync-History zu beachten.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Vom Zotero-Server wiederherstellen">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Alle Server-Daten löschen und mit lokalen Zotero-Daten überschreiben.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Zurücksetzen des Synchronisierungsverlaufs">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Überprüfung des Sicherungsservers für alle lokalen Datei-Anhänge erzwingen.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Zurücksetzen...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titel">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Aktualisiert">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Weitere Stile hinzufügen...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Tastenkombinationen">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Beliebiger String">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Erweitert">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Finden">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Artikel Finder verwalten">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Auswählen...">
 <!ENTITY zotero.preferences.dataDir.reveal "Datenverzeichnis anzeigen">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Datenbankwartung">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Integrität der Datenbank überprüfen">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Übersetzer und Stile zurücksetzen...">
diff --git a/chrome/locale/de/zotero/zotero.dtd b/chrome/locale/de/zotero/zotero.dtd
index cf3feb7bd7..8f0df53653 100644
--- a/chrome/locale/de/zotero/zotero.dtd
+++ b/chrome/locale/de/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Bearbeiten">
 <!ENTITY zotero.general.delete "Löschen">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Dieses Fehlerprotokoll kann unter Umständen Nachrichten enthalten, die nicht mit Zotero in Verbindung stehen.">
 <!ENTITY zotero.errorReport.submissionInProgress "Bitte warten Sie, während der Fehlerbericht übermittelt wird.">
 <!ENTITY zotero.errorReport.submitted "Der Fehlerbericht wurde übermittelt.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Bitte erstellen Sie einen Beitrag in den Zotero-Foren (forums.zotero.org) mit dieser Berichts-ID, einer Beschreibung des Fehlers und den Schritten, die notwendig sind, um ihn zu reproduzieren.">
 <!ENTITY zotero.errorReport.notReviewed "Fehlerberichte werden im Allgemeinen nicht beachtet, wenn kein entsprechender Thread im Forum erstellt wird.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Sie haben eine neue Version von Zotero installiert.">
 <!ENTITY zotero.upgrade.upgradeRequired "Ihre Zotero-Datenbank muss aktualisiert werden, damit sie mit der neuen Version funktioniert.">
 <!ENTITY zotero.upgrade.autoBackup "Ihre vorhandene Datenbank wird automatisch gesichert, bevor Änderungen vorgenommen werden.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Rechte">
 <!ENTITY zotero.items.dateAdded_column "hinzugefügt am">
 <!ENTITY zotero.items.dateModified_column "geändert am">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "In Bibliothek anzeigen">
 <!ENTITY zotero.items.menu.attach.note "Notiz hinzufügen">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Text transformieren">
 <!ENTITY zotero.item.textTransform.titlecase "englische Titel-Großschreibung">
 <!ENTITY zotero.item.textTransform.sentencecase "englische Satz-Großschreibung">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Neue Notiz">
 <!ENTITY zotero.toolbar.note.standalone "Neue eigenständige Notiz">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Sichtbare auswählen">
 <!ENTITY zotero.tagSelector.clearVisible "Sichtbare abwählen">
 <!ENTITY zotero.tagSelector.clearAll "Alle abwählen">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Tag umbenennen...">
 <!ENTITY zotero.tagSelector.deleteTag "Tag löschen...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Geben Sie die nachzuschlagende ISBN, DOI or PMID in das Eingabefeld unten ein.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Einträge auswählen">
 <!ENTITY zotero.selectitems.intro.label "Auswählen, welche Artikel zu Ihrer Bibliothek hinzugefügt werden sollen">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Nicht-markierte Tags werden nicht gespeichert.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Das Tag wird aus allen Einträgen gelöscht.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Proxy erkannt">
 <!ENTITY zotero.proxy.recognized.warning "Nur Proxys hinzufügen, die von Ihrer Bibliotheks-, Universitäts- oder Firmenwebsite verlinkt sind">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Das Hinzufügen anderer Proxies erlaubt es bösartigen Websites, sich als vertrauenswürdig auszugeben.">
diff --git a/chrome/locale/de/zotero/zotero.properties b/chrome/locale/de/zotero/zotero.properties
index 1769cf3505..646351b194 100644
--- a/chrome/locale/de/zotero/zotero.properties
+++ b/chrome/locale/de/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Später neustarten
 general.restartApp=%S neu starten
 general.errorHasOccurred=Ein Fehler ist aufgetreten.
 general.unknownErrorOccurred=Ein unbekannter Fehler ist aufgetreten.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Bitte starten Sie %S neu.
 general.restartFirefoxAndTryAgain=Bitte starten Sie %S neu und versuchen Sie es erneut.
 general.checkForUpdate=Auf Updates überprüfen
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Siehe %S für weitere Informationen.
 general.enable=Aktivieren
 general.disable=Deaktivieren
 general.remove=Entfernen
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Dokumentation öffnen
 general.numMore=%S mehr...
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Zotero ist beschäftigt.
 general.operationInProgress.waitUntilFinished=Bitte warten Sie, bis der Vorgang abgeschlossen ist.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Drücken Sie %S, um einen Fehlerbericht an die Zotero
 errorReport.stepsToReproduce=Schritte zur Reproduktion:
 errorReport.expectedResult=Erwartetes Ergebnis:
 errorReport.actualResult=Tatsächliches Ergebnis:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Der Zotero-Daten-Ordner konnte nicht gefunden werden.
 dataDir.previousDir=Vorheriger Ordner:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Den Firefox-Profil-Ordner verwenden
 dataDir.selectDir=Zotero-Daten-Ordner auswählen
 dataDir.selectedDirNonEmpty.title=Ordner nicht leer
 dataDir.selectedDirNonEmpty.text=Der Ordner, den Sie ausgewählt haben, ist nicht leer und scheint kein Zotero-Daten-Verzeichnis zu sein.\n\nDie Zotero-Dateien trotzdem in diesem Ordner anlegen?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Bestehende Zotero-Bibliothek gefunden
 dataDir.standaloneMigration.description=Sie benutzen %1$S anscheinend zum ersten Mal. Wollen Sie, dass %1$S die Einstellungen von %2$S übernimmt und Ihr bestehendes Datenverzeichnis verwendet?
 dataDir.standaloneMigration.multipleProfiles=%1$S wird seine Daten mit dem zuletzt verwendeten Profil teilen.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Neue gespeicherte Suche
 pane.collections.savedSearchName=Geben Sie einen Namen für diese gespeicherte Suche an:
 pane.collections.rename=Sammlung umbenennen:
 pane.collections.library=Meine Bibliothek
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Papierkorb
 pane.collections.untitled=Ohne Titel
 pane.collections.unfiled=Einträge ohne Sammlung
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Sind Sie sicher, dass Sie dieses Tag löschen wo
 pane.tagSelector.numSelected.none=0 Tags ausgewählt
 pane.tagSelector.numSelected.singular=%S Tag ausgewählt
 pane.tagSelector.numSelected.plural=%S Tags ausgewählt
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Lade die Liste der Einträge...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=In den Papierkorb verschieben
 pane.items.trash=Sind Sie sicher, dass Sie den ausgewählten Eintrag in den Papierkorb verschieben wollen?
 pane.items.trash.multiple=Sind Sie sicher, dass Sie die ausgewählten Einträge in den Papierkorb verschieben wollen?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S Einträge ausgewählt
 pane.item.unselected.zero=Keine Einträge in dieser Ansicht
 pane.item.unselected.singular=%S Eintrag in dieser Ansicht
 pane.item.unselected.plural=%S Einträge in dieser Ansicht
-pane.item.selectToMerge=Wählen Sie die zu zusammenführenden Einträge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Eintragstyp ändern
 pane.item.changeType.text=Sind Sie sicher, dass Sie den Eintragstyp ändern wollen?\n\nDie folgenden Felder werden dabei verloren gehen:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S Anhänge:
 pane.item.attachments.count.singular=%S Anhang:
 pane.item.attachments.count.plural=%S Anhänge:
 pane.item.attachments.select=Datei auswählen
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=hier klicken
-pane.item.tags=Tags:
 pane.item.tags.count.zero=%S Tags:
 pane.item.tags.count.singular=%S Tag:
 pane.item.tags.count.plural=%S Tags:
 pane.item.tags.icon.user=Vom Benutzer hinzugefügtes Tag
 pane.item.tags.icon.automatic=Automatisch hinzugefügtes Tag
-pane.item.related=Verwandte Einträge:
 pane.item.related.count.zero=%S verwandte Einträge:
 pane.item.related.count.singular=%S verwandter Eintrag:
 pane.item.related.count.plural=%S verwandte Einträge:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Sie können keine Dateien zur im Moment au
 ingester.saveToZotero=In Zotero speichern
 ingester.saveToZoteroUsing=In Zotero mit "%S" speichern
 ingester.scraping=Speichere Eintrag...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Eintrag gespeichert.
 ingester.scrapeError=Eintrag konnte nicht gespeichert werden.
 ingester.scrapeErrorDescription=Ein Fehler ist aufgetreten beim Versuch, diesen Artikel zu speichern. Überprüfen Sie %S für weitere Informationen.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=Für diese Website immer erlauben
 
 ingester.importFile.title=Datei importieren
 ingester.importFile.text=Wollen Sie die Datei "%S" importieren?\n\nDie Einträge werden zu einer neuen Sammlung hinzugefügt werden.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Nachschlagen
 ingester.lookup.error=Beim Nachschlagen dieses Eintrags ist ein Fehler aufgetreten.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=PDF- und andere Dateien in %S öffnen, f
 zotero.preferences.openurl.resolversFound.zero=%S Resolver gefunden
 zotero.preferences.openurl.resolversFound.singular=%S Resolver gefunden
 zotero.preferences.openurl.resolversFound.plural=%S Resolver gefunden
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Index neu aufbauen
 zotero.preferences.search.rebuildWarning=Wollen Sie den gesamten Index neu aufbauen? Dies kann eine Weile dauern.\n\nUm nur die noch nicht indizierten Einträge zu indizieren, verwenden Sie %S.
 zotero.preferences.search.clearIndex=Index löschen
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Sämtliche neuen oder m
 zotero.preferences.advanced.resetStyles=Stile zurücksetzen
 zotero.preferences.advanced.resetStyles.changesLost=Sämtliche neuen oder modifizierten Stile werden verloren gehen.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Die folgenden Dateien waren im Zielordner bereits vorhanden und wurden nicht kopiert:
 dragAndDrop.filesNotFound=Die folgenden Dateien wurden nicht gefunden und konnten nicht kopiert werden:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importieren
 fileInterface.export=Exportieren
 fileInterface.exportedItems=Exportierte Einträge
 fileInterface.imported=Importiert
-fileInterface.fileFormatUnsupported=Kein Übersetzer wurde für die ausgewählte Datei gefunden.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Literaturverzeichnis ohne Titel
 fileInterface.bibliographyHTMLTitle=Literaturverzeichnis
 fileInterface.importError=Ein Fehler ist aufgetreten beim Importieren der ausgewählten Datei. Bitte überprüfen Sie, ob die Datei korrekt ist und versuchen Sie es erneut.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Die ausgewählten Einträge beinhalten keine Lit
 fileInterface.bibliographyGenerationError=Ein Fehler ist aufgetreten bei dem Versuch, das Literaturverzeichnis zu erstellen. Bitte erneut versuchen.
 fileInterface.exportError=Ein Fehler ist aufgetreten bei dem Versuch, die ausgewählte Datei zu exportieren.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Erweiterter Suchmodus — drücken Sie die Eingabetaste zum Suchen.
 searchInProgress=Suche läuft — bitte warten.
 
@@ -613,6 +677,7 @@ integration.cited.loading=Lade zitierte Einträge
 integration.ibid=ebd
 integration.emptyCitationWarning.title=Leere Zitation
 integration.emptyCitationWarning.body=Die ausgewählte Zitation wäre im aktuell ausgewählten Stil leer. Sind Sie sicher, dass Sie sie hinzufügen wollen?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Diese Version des Zotero Textverarbeitungs-Plugins ($INTEGRATION_VERSION) ist nicht mit der aktuell installierten Version der Zotero-Firefox-Erweiterung (%1$S) kompatibel. Bitte stellen Sie sicher, dass Sie die aktuellsten Versionen der beiden Komponenten verwenden.
 integration.error.incompatibleVersion2=Zotero %1$S benötigt %2$S %3$S oder neuer. Bitte laden Sie die neueste Verson von %2$S von zotero.org herunter.
@@ -643,14 +708,22 @@ integration.citationChanged=Sie haben Veränderungen an dieser Zitation vorgenom
 integration.citationChanged.description=Wenn Sie "Ja" auswählen, wird Zotero diese Zitation nicht aktualisieren, wenn Sie weitere Zitationen hinzufügen, einen anderen Zitationsstil wählen oder die Literaturangabe, auf die sie sich bezieht, verändern. Wenn Sie "Nein" wählen, werden ihre Veränderungen gelöscht.
 integration.citationChanged.edit=Sie haben Veränderungen an dieser Zitation vorgenommen, nachdem sie von Zotero erstellt wurde. Das Editieren wird Ihre Veränderungen löschen. Wollen Sie fortsetzen?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Stil "%1$S" von %2$S installieren?
 styles.updateStyle=Bestehenden Stil "%1$S" mit "%2$S" von %3$S aktualisieren?
 styles.installed=Der Stil "%S" wurde erfolgreich installiert.
 styles.installError=%S scheint keine gültige Zitierstils-Datei zu sein.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S ruft eine ungültige oder nicht existierenden CSL-Datei unter %2$S als Quelle auf.
 styles.deleteStyle=Sind Sie sicher, dass Sie den Stil "%1$S" löschen wollen?
 styles.deleteStyles=Sind Sie sicher, dass Sie die ausgewählten Stile löschen wollen?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Sync abbrechen
 sync.openSyncPreferences=Sync-Einstellungen öffnen...
 sync.resetGroupAndSync=Gruppe zurücksetzen und synchronisieren
@@ -660,8 +733,10 @@ sync.remoteObject=Remote-Objekt
 sync.mergedObject=Zusammengeführtes Objekt
 
 sync.error.usernameNotSet=Benutzername nicht definiert
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Passwort nicht definiert
 sync.error.invalidLogin=Ungültiger Benutzername oder Passwort
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Bitte geben Sie ein Passwort ein.
 sync.error.loginManagerCorrupted1=Zotero kann nicht auf Ihre Login-Informationen zugreifen, wahrscheinlich aufgrund einer beschädigten %S-Login-Manager-Datenbank.
 sync.error.loginManagerCorrupted2=Schließen Sie %S, legen Sie ein Backup an und löschen Sie signons.* aus Ihrem %S-Profilordner. Geben Sie dann Ihre Logindaten erneut im Sync-Reiter der Zotero-Einstellungen ein.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Wenn Sie fortfahren, wird Ihre Kopie der Gruppe zur
 sync.error.copyChangedItems=Wenn Sie Ihre Änderungen an einen anderen Ort kopieren oder sich vom Gruppenadministrator Schreibrechte erbitten wollen, brechen Sie die Synchronisierung jetzt ab.
 sync.error.manualInterventionRequired=Eine automatische Synchronisierung führte zu einem Konflikt, der manuelles Eingreifen notwendig macht.
 sync.error.clickSyncIcon=Klicken Sie auf das Synchronisierungs-Icon, um manuell zu synchronisieren.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Noch nicht synchronisiert
 sync.status.lastSync=Letzte Synchronisierung:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Daten zum Sync-Server hochladen
 sync.status.uploadAccepted=Upload akzeptiert \u2014 warte auf Sync-Server
 sync.status.syncingFiles=Synchronisiere Dateien
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB verbleibend
 sync.storage.filesRemaining=%1$S/%2$S Dateien
 sync.storage.none=Keine
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Lokale Datei
 sync.storage.remoteFile=Remote-Datei
 sync.storage.savedFile=Gespeicherte Datei
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Server-Konfiguration verifiziert
 sync.storage.fileSyncSetUp=Datei-Synchronisierung wurde erfolgreich eingerichtet.
 sync.storage.openAccountSettings=Account-Einstellungen öffnen
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Der Server %S konnte nicht erreicht werden.
 sync.storage.error.permissionDeniedAtAddress=Sie haben keine hinreichenden Rechte, um ein Zotero-Verzeichnis unter der folgenden Adresse anzulegen:
 sync.storage.error.checkFileSyncSettings=Bitte überprüfen Sie Ihre Datei-Sync-Einstellungen oder kontaktieren Sie Ihren Server-Administrator.
 sync.storage.error.verificationFailed=%S Verifizierung fehlgeschlagen. Überprüfen Sie Ihre Datei-Sync-Einstellungen im Sync-Reiter der Zotero-Einstellungen.
 sync.storage.error.fileNotCreated=Die Datei '%S' konnte nicht im Zotero-Ordner "storage" angelegt werden.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Sie haben keine Dateibearbeitungsberechtigung mehr für die Zotero-Gruppe '%S', und die Dateien, die Sie hinzugefügt oder bearbeitet haben, können nicht mit dem Server synchronisiert werden.
 sync.storage.error.copyChangedItems=Wenn Sie die veränderten Einträge und Dateien an einen anderen Ort kopieren wollen, brechen Sie die Synchronisierung jetzt ab.
 sync.storage.error.fileUploadFailed=Datei-Upload fehlgeschlagen.
 sync.storage.error.directoryNotFound=Verzeichnis nicht gefunden
 sync.storage.error.doesNotExist=%S existiert nicht.
 sync.storage.error.createNow=Wollen Sie es jetzt erstellen?
-sync.storage.error.webdav.enterURL=Bitte geben Sie eine WebDAV-URL ein.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S ist keine gültige WebDAV-URL.
 sync.storage.error.webdav.invalidLogin=Der WebDAV-Server hat den eingegebenen Benutzernamen und das Passwort nicht akzeptiert.
 sync.storage.error.webdav.permissionDenied=Sie haben keine Zugriffsberechtigung für %S auf dem WebDAV-Server.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL-Verbindungsfehler beim Verbinde
 sync.storage.error.webdav.loadURLForMoreInfo=Laden Sie Ihre WebDAV-URL im Browser für weitere Informationen.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Siehe die Dokumenkation zum Zertifikats-Override für weitere Informationen.
 sync.storage.error.webdav.loadURL=Lade WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Sie haben Ihr Zotero-Dateispeicherungskontingent ausgeschöpft. Einige Dateien wurden nicht hochgeladen. Andere Zotero-Daten werden weiterhin zum Server synchronisiert.
 sync.storage.error.zfs.personalQuotaReached2=Gehen Sie zu Ihren zotero.org Accounteinstellungen für weitere Speicheroptionen.
 sync.storage.error.zfs.groupQuotaReached1=Die Gruppe '%S' hat ihr Zotero-Dateispeicherungskontingent ausgeschöpft. Einige Dateien wurden nicht hochgeladen. Andere Zotero-Daten werden weiterhin zum Server synchronisiert.
 sync.storage.error.zfs.groupQuotaReached2=Der Gruppenbesitzer kann das Speicherungskontigent in den Speichereinstellungen auf zotero.org vergrößern.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Tag speichern
 sync.longTagFixer.saveTags=Tags speichern
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Text aus PDF konnte nicht gelesen werden.
 recognizePDF.noMatches=Keine passenden Bezüge gefunden.
 recognizePDF.fileNotFound=Datei nicht gefunden.
 recognizePDF.limit=Abfrage-Limit erreicht. Versuchen Sie es später erneut.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadaten-Abruf abgeschlossen.
 recognizePDF.close.label=Schließen
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Wählen Sie einen Speicherort für die formatierte Datei
 rtfScan.scannedFileSuffix=(Gescannt)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Nachschlagen fehlgeschlagen
 lookup.failure.description=Zotero konnte keinen Eintrag für den angegeben Identifier finden. Bitte überprüfen Sie den Identifier und versuchen Sie es erneut.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Online anzeigen
 locate.online.tooltip=Online zu diesem Eintrag gehen
diff --git a/chrome/locale/el-GR/zotero/about.dtd b/chrome/locale/el-GR/zotero/about.dtd
index 7c54fe4951..40a016b3fd 100644
--- a/chrome/locale/el-GR/zotero/about.dtd
+++ b/chrome/locale/el-GR/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Ειδικές Ευχαριστίες:">
 <!ENTITY zotero.about.close "Κλείσιμο">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/el-GR/zotero/preferences.dtd b/chrome/locale/el-GR/zotero/preferences.dtd
index c34d885121..6eded0b8e9 100644
--- a/chrome/locale/el-GR/zotero/preferences.dtd
+++ b/chrome/locale/el-GR/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Default:">
 <!ENTITY zotero.preferences.items "items">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "General">
 
@@ -59,9 +60,14 @@
 <!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.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.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.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.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">
@@ -70,6 +76,7 @@
 <!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 "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reset...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Any string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Advanced">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Choose...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
diff --git a/chrome/locale/el-GR/zotero/standalone.dtd b/chrome/locale/el-GR/zotero/standalone.dtd
index f63a223052..e02c6a5a54 100644
--- a/chrome/locale/el-GR/zotero/standalone.dtd
+++ b/chrome/locale/el-GR/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/el-GR/zotero/zotero.dtd b/chrome/locale/el-GR/zotero/zotero.dtd
index 5ea5c28572..286f163ffc 100644
--- a/chrome/locale/el-GR/zotero/zotero.dtd
+++ b/chrome/locale/el-GR/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Edit">
 <!ENTITY zotero.general.delete "Delete">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!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.">
 <!ENTITY zotero.errorReport.submitted "Your error report has been submitted.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Please post a message to the Zotero forums (forums.zotero.org) with this Report ID, a description of the problem, and any steps necessary to reproduce it.">
 <!ENTITY zotero.errorReport.notReviewed "Error reports are generally not reviewed unless referred to in the forums.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "You have installed a new version of Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Your Zotero database must be upgraded to work with the new version.">
 <!ENTITY zotero.upgrade.autoBackup "Your existing database will be backed up automatically before any changes are made.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Rights">
 <!ENTITY zotero.items.dateAdded_column "Date Added">
 <!ENTITY zotero.items.dateModified_column "Date Modified">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Show in Library">
 <!ENTITY zotero.items.menu.attach.note "Add Note">
@@ -75,8 +93,8 @@
 
 <!ENTITY zotero.toolbar.newItem.label "New Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label "More">
-<!ENTITY zotero.toolbar.newItemFromPage.label "Create New Item from Current Page">
-<!ENTITY zotero.toolbar.lookup.label "Add Item by Identifier">
+<!ENTITY zotero.toolbar.newItemFromPage.label "Create Web Page Item from Current Page">
+<!ENTITY zotero.toolbar.lookup.label "Add Item(s) by Identifier">
 <!ENTITY zotero.toolbar.removeItem.label "Remove Item...">
 <!ENTITY zotero.toolbar.newCollection.label "New Collection...">
 <!ENTITY zotero.toolbar.newGroup "New Group...">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transform Text">
 <!ENTITY zotero.item.textTransform.titlecase "Title Case">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "New Note">
 <!ENTITY zotero.toolbar.note.standalone "New Standalone Note">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Select visible">
 <!ENTITY zotero.tagSelector.clearVisible "Deselect visible">
 <!ENTITY zotero.tagSelector.clearAll "Deselect all">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Rename Tag...">
 <!ENTITY zotero.tagSelector.deleteTag "Delete Tag...">
 
-<!ENTITY zotero.lookup.description "Enter the ISBN, DOI, or PMID to look up in the box below.">
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
+<!ENTITY zotero.lookup.description "Enter one or more ISBNs, DOIs, or PMIDs to look up in the box below.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Select Items">
 <!ENTITY zotero.selectitems.intro.label "Select which items you'd like to add to your library">
@@ -208,6 +235,10 @@
 <!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.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!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/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties
index df8a91108a..a1e0892121 100644
--- a/chrome/locale/el-GR/zotero/zotero.properties
+++ b/chrome/locale/el-GR/zotero/zotero.properties
@@ -14,8 +14,11 @@ general.restartLater=Restart later
 general.restartApp=Restart %S
 general.errorHasOccurred=An error has occurred.
 general.unknownErrorOccurred=An unknown error occurred.
-general.restartFirefox=Please restart %S.
-general.restartFirefoxAndTryAgain=Please restart %S and try again.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
+general.restartFirefox=Please restart Firefox.
+general.restartFirefoxAndTryAgain=Please restart Firefox and try again.
 general.checkForUpdate=Check for update
 general.actionCannotBeUndone=This action cannot be undone.
 general.install=Install
@@ -35,8 +38,12 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -57,7 +64,7 @@ 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 %S to try the upgrade again.
+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...
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Press %S to send an error report to the Zotero develo
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=The Zotero data directory could not be found.
 dataDir.previousDir=Previous directory:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Use %S profile directory
 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?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=New Saved Search
 pane.collections.savedSearchName=Enter a name for this saved search:
 pane.collections.rename=Rename collection:
 pane.collections.library=My Library
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Trash
 pane.collections.untitled=Untitled
 pane.collections.unfiled=Unfiled Items
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Are you sure you want to delete this tag?\n\nThe
 pane.tagSelector.numSelected.none=0 tags selected
 pane.tagSelector.numSelected.singular=%S tag selected
 pane.tagSelector.numSelected.plural=%S tags selected
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Loading items list...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
 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?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S items selected
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Change Item Type
 pane.item.changeType.text=Are you sure you want to change the item type?\n\nThe following fields will be lost:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S attachments:
 pane.item.attachments.count.singular=%S attachment:
 pane.item.attachments.count.plural=%S attachments:
 pane.item.attachments.select=Select a File
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=click here
-pane.item.tags=Tags:
 pane.item.tags.count.zero=%S tags:
 pane.item.tags.count.singular=%S tag:
 pane.item.tags.count.plural=%S tags:
 pane.item.tags.icon.user=User-added tag
 pane.item.tags.icon.automatic=Automatically added tag
-pane.item.related=Related:
 pane.item.related.count.zero=%S related:
 pane.item.related.count.singular=%S related:
 pane.item.related.count.plural=%S related:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=Saving Item...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Item Saved
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
@@ -427,13 +468,14 @@ ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
-db.dbCorrupted.restart=Please restart %S to attempt an automatic restore from the last backup.
+db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
 db.dbCorruptedNoBackup=The Zotero database '%S' appears to have become corrupted, and no automatic backup is available.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
 db.dbRestored=The Zotero database '%1$S' appears to have become corrupted.\n\nYour data was restored from the last automatic backup made on %2$S at %3$S. The damaged file was saved in your Zotero directory.
 db.dbRestoreFailed=The Zotero database '%S' appears to have become corrupted, and an attempt to restore from the last automatic backup failed.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S resolvers found
 zotero.preferences.openurl.resolversFound.singular=%S resolver found
 zotero.preferences.openurl.resolversFound.plural=%S resolvers found
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Rebuild Index
 zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
 zotero.preferences.search.clearIndex=Clear Index
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Any new or modified tra
 zotero.preferences.advanced.resetStyles=Reset Styles
 zotero.preferences.advanced.resetStyles.changesLost=Any new or modified styles will be lost.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
 
@@ -500,7 +559,8 @@ fileInterface.import=Import
 fileInterface.export=Export
 fileInterface.exportedItems=Exported Items
 fileInterface.imported=Imported
-fileInterface.fileFormatUnsupported=No translator could be found for the given file.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 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.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=The items you have selected contain no reference
 fileInterface.bibliographyGenerationError=An error occurred generating your bibliography. Please try again.
 fileInterface.exportError=An error occurred while trying to export the selected file.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Advanced search mode — press Enter to search.
 searchInProgress=Search in progress — please wait.
 
@@ -613,11 +677,12 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Blank Citation
 integration.emptyCitationWarning.body=The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Error
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Zotero experienced an error updating your document.
 integration.error.mustInsertCitation=You must insert a citation before performing this operation.
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Install style "%1$S" from %2$S?
 styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
 styles.installed=The style "%S" was installed successfully.
-styles.installError=%S does not appear to be a valid style file.
+styles.installError="%S" is not a valid style file.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 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?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancel Sync
 sync.openSyncPreferences=Open Sync Preferences...
 sync.resetGroupAndSync=Reset Group and Sync
@@ -660,18 +733,55 @@ sync.remoteObject=Remote Object
 sync.mergedObject=Merged Object
 
 sync.error.usernameNotSet=Username not set
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Password not set
 sync.error.invalidLogin=Invalid username or password
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 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 %S.
+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 '%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.error.manualInterventionRequired=Conflicts have suspended automatic syncing.
+sync.error.clickSyncIcon=Click the sync icon to resolve them.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Not yet synced
 sync.status.lastSync=Last sync:
@@ -682,9 +792,12 @@ 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.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB remaining
 sync.storage.filesRemaining=%1$S/%2$S files
 sync.storage.none=None
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Local File
 sync.storage.remoteFile=Remote File
 sync.storage.savedFile=Saved File
@@ -692,17 +805,23 @@ sync.storage.serverConfigurationVerified=Server configuration verified
 sync.storage.fileSyncSetUp=File sync is successfully set up.
 sync.storage.openAccountSettings=Open Account Settings
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=The server %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=%S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
 sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=You no longer have file editing access to the Zotero group '%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=%S does not exist.
 sync.storage.error.createNow=Do you want to create it now?
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
 sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1=The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2=The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Save Tag
 sync.longTagFixer.saveTags=Save Tags
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Could not read text from PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=File not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Close
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(Scanned)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/en-US/zotero/about.dtd b/chrome/locale/en-US/zotero/about.dtd
index 731577e2d6..6e8ee57334 100644
--- a/chrome/locale/en-US/zotero/about.dtd
+++ b/chrome/locale/en-US/zotero/about.dtd
@@ -9,4 +9,5 @@
 <!ENTITY zotero.executiveProducer		"Executive Producer:">
 <!ENTITY zotero.thanks			"Special Thanks:">
 <!ENTITY zotero.about.close	"Close">
-<!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
\ No newline at end of file
+<!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing	"Citation &amp; Bibliography Processing">
\ No newline at end of file
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index b50e5a849c..921fad32c0 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -65,6 +65,9 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand		"as needed">
 <!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.warning1						"The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2						"Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3						" for more information.">
 <!ENTITY zotero.preferences.sync.reset.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">
@@ -159,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable				"&#37;a - Any string">
 
 <!ENTITY zotero.preferences.prefpane.advanced				"Advanced">
+<!ENTITY zotero.preferences.advanced.filesAndFolders		"Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate					"Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager		"Article Lookup Engine Manager">
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index a094f7bad4..0e4fa616dc 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit								"Edit">
 <!ENTITY zotero.general.delete 								"Delete">
 
+<!ENTITY zotero.errorReport.title							"Zotero Error Report">
 <!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.">
 <!ENTITY zotero.errorReport.submitted						"Your error report has been submitted.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums					"Please post a message to the Zotero forums (forums.zotero.org) with this Report ID, a description of the problem, and any steps necessary to reproduce it.">
 <!ENTITY zotero.errorReport.notReviewed					"Error reports are not reviewed unless referred to in the forums.">
 
+<!ENTITY zotero.upgrade.title							"Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled				"You have installed a new version of Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired					"Your Zotero database must be upgraded to work with the new version.">
 <!ENTITY zotero.upgrade.autoBackup							"Your existing database will be backed up automatically before any changes are made.">
@@ -92,7 +94,7 @@
 <!ENTITY zotero.toolbar.newItem.label					"New Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label			"More">
 <!ENTITY zotero.toolbar.newItemFromPage.label			"Create Web Page Item from Current Page">
-<!ENTITY zotero.toolbar.lookup.label				"Add Item by Identifier">
+<!ENTITY zotero.toolbar.lookup.label				"Add Item(s) by Identifier">
 <!ENTITY zotero.toolbar.removeItem.label				"Remove Item…">
 <!ENTITY zotero.toolbar.newCollection.label			"New Collection…">
 <!ENTITY zotero.toolbar.newGroup						"New Group…">
@@ -119,6 +121,7 @@
 <!ENTITY zotero.item.textTransform						"Transform Text">
 <!ENTITY zotero.item.textTransform.titlecase			"Title Case">
 <!ENTITY zotero.item.textTransform.sentencecase			"Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap      	"Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote				"New Note">
 <!ENTITY zotero.toolbar.note.standalone				"New Standalone Note">
@@ -146,7 +149,8 @@
 <!ENTITY zotero.tagColorChooser.setColor       "Set Color">
 <!ENTITY zotero.tagColorChooser.removeColor    "Remove Color">
 
-<!ENTITY zotero.lookup.description				"Enter the ISBN, DOI, or PMID to look up in the box below.">
+<!ENTITY zotero.lookup.description				"Enter one or more ISBNs, DOIs, or PMIDs to look up in the box below.">
+<!ENTITY zotero.lookup.button.search				"Search">
 
 <!ENTITY zotero.selectitems.title						"Select Items">
 <!ENTITY zotero.selectitems.intro.label				"Select which items you'd like to add to your library">
@@ -231,6 +235,10 @@
 <!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.merge.title                           "Conflict Resolution">
+<!ENTITY zotero.merge.of                              "of">
+<!ENTITY zotero.merge.deleted                         "Deleted">
+
 <!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 0ce10bd587..a821742d64 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater					= Restart later
 general.restartApp					= Restart %S
 general.errorHasOccurred			= An error has occurred.
 general.unknownErrorOccurred		= An unknown error occurred.
+general.invalidResponseServer		= Invalid response from server.
+general.tryAgainLater 				= Please try again in a few minutes.
+general.serverError					= The server returned an error. Please try again.
 general.restartFirefox				= Please restart %S.
 general.restartFirefoxAndTryAgain	= Please restart %S and try again.
 general.checkForUpdate				= Check for update
@@ -35,8 +38,12 @@ general.seeForMoreInformation		= See %S for more information.
 general.enable						= Enable
 general.disable						= Disable
 general.remove						= Remove
+general.reset						= Reset
+general.quit						= Quit
+general.useDefault					= Use Default
 general.openDocumentation			= Open Documentation
 general.numMore                    = %S more…
+general.openPreferences				= Open Preferences
 
 general.operationInProgress = A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished = Please wait until it has finished.
@@ -68,6 +75,10 @@ errorReport.advanceMessage			= Press %S to send an error report to the Zotero de
 errorReport.stepsToReproduce		= Steps to Reproduce:
 errorReport.expectedResult			= Expected result:
 errorReport.actualResult			= Actual result:
+errorReport.noNetworkConnection		= No network connection
+errorReport.invalidResponseRepository	= Invalid response from repository
+errorReport.repoCannotBeContacted	= Repository cannot be contacted
+
 
 attachmentBasePath.selectDir                                   = Choose Base Directory
 attachmentBasePath.chooseNewPath.title                         = Confirm New Base Directory
@@ -87,6 +98,10 @@ dataDir.useProfileDir				= Use %S profile directory
 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?
+dataDir.selectedDirEmpty.title			= Directory Empty
+dataDir.selectedDirEmpty.text			= The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title		= Incompatible Database Version
+dataDir.incompatibleDbVersion.text		= The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title				= Existing Zotero Library Found
 dataDir.standaloneMigration.description			= This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles	= %1$S will share its data directory with the most recently used profile.
@@ -126,6 +141,7 @@ pane.collections.newSavedSeach	= New Saved Search
 pane.collections.savedSearchName = Enter a name for this saved search:
 pane.collections.rename			= Rename collection:
 pane.collections.library		= My Library
+pane.collections.groupLibraries	= Group Libraries
 pane.collections.trash			= Trash
 pane.collections.untitled		= Untitled
 pane.collections.unfiled		= Unfiled Items
@@ -156,6 +172,8 @@ tagColorChooser.numberKeyInstructions          = You can add this tag to selecte
 tagColorChooser.maxTags                        = Up to %S tags in each library can have colors assigned.
 
 pane.items.loading				= Loading items list…
+pane.items.attach.link.uri.title	 	= Attach Link to URI
+pane.items.attach.link.uri		= Enter a URI:
 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?
@@ -195,7 +213,12 @@ pane.item.selected.multiple		= %S items selected
 pane.item.unselected.zero  	= No items in this view
 pane.item.unselected.singular	= %S item in this view
 pane.item.unselected.plural		= %S items in this view
-pane.item.selectToMerge			= Select items to merge
+
+pane.item.duplicates.selectToMerge			= Select items to merge
+pane.item.duplicates.mergeItems				= Merge %S items
+pane.item.duplicates.writeAccessRequired	= Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel			= Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType		= Merged items must all be of the same item type.
 
 pane.item.changeType.title			= Change Item Type
 pane.item.changeType.text		= Are you sure you want to change the item type?\n\nThe following fields will be lost:
@@ -221,14 +244,15 @@ pane.item.attachments.count.zero      = %S attachments:
 pane.item.attachments.count.singular  = %S attachment:
 pane.item.attachments.count.plural    = %S attachments:
 pane.item.attachments.select			= Select a File
+pane.item.attachments.PDF.installTools.title	= PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text		= To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename			= Filename
 pane.item.noteEditor.clickHere			= click here
-pane.item.tags					 = Tags:
 pane.item.tags.count.zero       = %S tags:
 pane.item.tags.count.singular   = %S tag:
 pane.item.tags.count.plural     = %S tags:
 pane.item.tags.icon.user			= User-added tag
 pane.item.tags.icon.automatic	= Automatically added tag
-pane.item.related				= Related:
 pane.item.related.count.zero    = %S related:
 pane.item.related.count.singular = %S related:
 pane.item.related.count.plural  = %S related:
@@ -432,7 +456,7 @@ save.error.cannotAddFilesToCollection = You cannot add files to the currently se
 ingester.saveToZotero			= Save to Zotero
 ingester.saveToZoteroUsing		= Save to Zotero using "%S"
 ingester.scraping				= Saving Item…
-ingester.scrapingTo				= Saving to 
+ingester.scrapingTo				= Saving to
 ingester.scrapeComplete			= Item Saved
 ingester.scrapeError			= Could Not Save Item
 ingester.scrapeErrorDescription	= An error occurred while saving this item. Check %S for more information.
@@ -473,6 +497,19 @@ zotero.preferences.launchNonNativeFiles                   = Open PDFs and other
 zotero.preferences.openurl.resolversFound.zero			= %S resolvers found
 zotero.preferences.openurl.resolversFound.singular		= %S resolver found
 zotero.preferences.openurl.resolversFound.plural			= %S resolvers found
+
+zotero.preferences.sync.purgeStorage.title			= Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc			= If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton		= Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton		= Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing			= You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer			= All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData			= Replace Local Data
+zotero.preferences.sync.reset.restartToComplete			= Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer			= All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData			= Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory			= All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex						= Rebuild Index
 zotero.preferences.search.rebuildWarning					= Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
 zotero.preferences.search.clearIndex						= Clear Index
@@ -509,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost				= Any new or modifie
 zotero.preferences.advanced.resetStyles								= Reset Styles
 zotero.preferences.advanced.resetStyles.changesLost					= Any new or modified styles will be lost.
 
+zotero.preferences.advanced.debug.title = Debug Output Submitted
+zotero.preferences.advanced.debug.sent = Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error = An error occurred sending debug output.
+
 dragAndDrop.existingFiles = The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound = The following files were not found and could not be copied:
 
@@ -518,7 +559,8 @@ fileInterface.import			= Import
 fileInterface.export			= Export
 fileInterface.exportedItems		= Exported Items
 fileInterface.imported 			= Imported
-fileInterface.fileFormatUnsupported = No translator could be found for the given file.
+fileInterface.unsupportedFormat = The selected file is not in a supported format.
+fileInterface.viewSupportedFormats = View Supported Formats…
 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.
@@ -527,6 +569,10 @@ fileInterface.noReferencesError	= The items you have selected contain no referen
 fileInterface.bibliographyGenerationError = An error occurred generating your bibliography. Please try again.
 fileInterface.exportError = An error occurred while trying to export the selected file.
 
+quickSearch.mode.titleCreatorYear	= Title, Creator, Year
+quickSearch.mode.fieldsAndTags 		= All Fields & Tags
+quickSearch.mode.everything 		= Everything
+
 advancedSearchMode				= Advanced search mode — press Enter to search.
 searchInProgress					= Search in progress — please wait.
 
@@ -677,6 +723,7 @@ styles.abbreviations.title			= Load Abbreviations
 styles.abbreviations.parseError		= The abbreviations file "%1$S" is not valid JSON.
 styles.abbreviations.missingInfo	= The abbreviations file "%1$S" does not specify a complete info block.
 
+sync.sync							= Sync
 sync.cancel							= Cancel Sync
 sync.openSyncPreferences			= Open Sync Preferences
 sync.resetGroupAndSync				= Reset Group and Sync
@@ -686,8 +733,10 @@ sync.remoteObject					= Remote Object
 sync.mergedObject					= Merged Object
 
 sync.error.usernameNotSet			= Username not set
+sync.error.usernameNotSet.text		= You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet			= Password not set
 sync.error.invalidLogin				= Invalid username or password
+sync.error.invalidLogin.text		= The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword			= Please enter a password.
 sync.error.loginManagerCorrupted1	= Zotero cannot access your login information, likely due to a corrupted %S login manager database.
 sync.error.loginManagerCorrupted2	= Close %1$S, back up and delete signons.* from your %2$S profile, and re-enter your Zotero login information in the Sync pane of the Zotero preferences.
@@ -696,8 +745,43 @@ sync.error.syncInProgress.wait		= Wait for the previous sync to complete or rest
 sync.error.writeAccessLost			= You no longer have write access to the Zotero group '%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.error.manualInterventionRequired	= Conflicts have suspended automatic syncing.
+sync.error.clickSyncIcon			= Click the sync icon to resolve them.
+sync.error.invalidClock				= The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError 		= SSL connection error
+sync.error.checkConnection 			= Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer 		= Empty response from server.
+sync.error.invalidCharsFilename		= The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount	= This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined		= If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1		= Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData				= To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2		= If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert			= One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log			= A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept 		= The remote versions have been kept.
+sync.conflict.remoteVersionKept 		= The remote version has been kept.
+sync.conflict.localVersionsKept 		= The local versions have been kept.
+sync.conflict.localVersionKept			= The local version has been kept.
+sync.conflict.recentVersionsKept 		= The most recent versions have been kept.
+sync.conflict.recentVersionKept 		= The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole			= View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion				= Local version: %S
+sync.conflict.remoteVersion				= Remote version: %S
+sync.conflict.deleted					= [deleted]
+sync.conflict.collectionItemMerge.alert	= One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log	= Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert		= One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log			= The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote			= It has been added to the following remote items:
+sync.conflict.tag.addedToLocal			= It has been added to the following local items:
+
+sync.conflict.fileChanged				= The following file has been changed in multiple locations.
+sync.conflict.itemChanged				= The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep		= Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion			= Choose this version
 
 sync.status.notYetSynced			= Not yet synced
 sync.status.lastSync				= Last sync:
@@ -721,17 +805,23 @@ sync.storage.serverConfigurationVerified	= Server configuration verified
 sync.storage.fileSyncSetUp			= File sync is successfully set up.
 sync.storage.openAccountSettings	= Open Account Settings
 
+sync.storage.error.default						= A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart				= A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached		= The server %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			= %S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
 sync.storage.error.fileNotCreated				= The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames			= Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost		= You no longer have file editing access to the Zotero group '%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					= %S does not exist.
 sync.storage.error.createNow					= Do you want to create it now?
+
+sync.storage.error.webdav.default				= A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart		= A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
 sync.storage.error.webdav.enterURL				= Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL			= %S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin			= The WebDAV server did not accept the username and password you entered.
@@ -742,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError	= SSL connection error connecting t
 sync.storage.error.webdav.loadURLForMoreInfo	= Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation	= See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL				= Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload		= A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title	= WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig			= Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart				= A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads		= You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1 	= You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2 	= See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1	 	= The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2	 	= The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota		= The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag			= Save Tag
 sync.longTagFixer.saveTags			= Save Tags
@@ -783,8 +880,21 @@ rtfScan.rtf							= Rich Text Format (.rtf)
 rtfScan.saveTitle					= Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix			= (Scanned)
 
+
+file.accessError.theFile			= The file '%S'
+file.accessError.aFile				= A file
+file.accessError.cannotBe			= cannot be
+file.accessError.created			= created
+file.accessError.updated			= updated
+file.accessError.deleted			= deleted
+file.accessError.message.windows	= Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other		= Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart			= Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir		= Show Parent Directory
+
 lookup.failure.title				= Lookup Failed
 lookup.failure.description			= Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description		= Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label					= View Online
 locate.online.tooltip				= Go to this item online
diff --git a/chrome/locale/es-ES/zotero/about.dtd b/chrome/locale/es-ES/zotero/about.dtd
index 7b8558525c..fbc115fc6c 100644
--- a/chrome/locale/es-ES/zotero/about.dtd
+++ b/chrome/locale/es-ES/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Agradecimientos especiales:">
 <!ENTITY zotero.about.close "Cerrar">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Más créditos y reconocimientos">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/es-ES/zotero/preferences.dtd b/chrome/locale/es-ES/zotero/preferences.dtd
index f349623fc2..6682ed20ee 100644
--- a/chrome/locale/es-ES/zotero/preferences.dtd
+++ b/chrome/locale/es-ES/zotero/preferences.dtd
@@ -1,16 +1,17 @@
 <!ENTITY zotero.preferences.title "Preferencias de Zotero">
 
 <!ENTITY zotero.preferences.default "Inicial:">
-<!ENTITY zotero.preferences.items "ítems">
+<!ENTITY zotero.preferences.items "elementos">
 <!ENTITY zotero.preferences.period ",">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "General">
 
 <!ENTITY zotero.preferences.userInterface "Interfaz de usuario">
 <!ENTITY zotero.preferences.showIn "Cargar Zotero en:">
 <!ENTITY zotero.preferences.showIn.browserPane "Panel de navegador">
-<!ENTITY zotero.preferences.showIn.separateTab "Lengüeta de separación">
-<!ENTITY zotero.preferences.showIn.appTab "Lengüeta de aplicación">
+<!ENTITY zotero.preferences.showIn.separateTab "Pestaña de separación">
+<!ENTITY zotero.preferences.showIn.appTab "Pestaña de aplicación">
 <!ENTITY zotero.preferences.statusBarIcon "Icono en la barra de estado:">
 <!ENTITY zotero.preferences.statusBarIcon.none "Nada">
 <!ENTITY zotero.preferences.fontSize "Tamaño de letra:">
@@ -25,20 +26,20 @@
 <!ENTITY zotero.preferences.updateNow "Hacerlo ahora">
 <!ENTITY zotero.preferences.reportTranslationFailure "Informar de fallos en los traductores de página">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Permitir que zotero.org personalice contenido basándose en la versión actual de Zotero">
-<!ENTITY zotero.preferences.zoteroDotOrgVersionHeader.tooltip "Si se habilita, la versión actual de Zotero se agregará a las peticiones HTTP a zotero.org">
-<!ENTITY zotero.preferences.parseRISRefer "Usar Zotero para los ficheros RIS/Refer descargados">
-<!ENTITY zotero.preferences.automaticSnapshots "Tomar instantáneas automáticamente al crear ítems a partir de páginas Web">
-<!ENTITY zotero.preferences.downloadAssociatedFiles "Adjuntar automáticamente los archivos PDF y de otros tipos al guardar ítems">
-<!ENTITY zotero.preferences.automaticTags "Marcar ítems automáticamente con palabras clave y cabeceras de asunto">
-<!ENTITY zotero.preferences.trashAutoEmptyDaysPre "Eliminar automáticamente ítems de la papelera que fueron borrados hace más de ">
+<!ENTITY zotero.preferences.zoteroDotOrgVersionHeader.tooltip "Si se activa, la versión actual de Zotero se añadirá a las peticiones HTTP a zotero.org">
+<!ENTITY zotero.preferences.parseRISRefer "Usar Zotero para los archivos RIS/Refer descargados">
+<!ENTITY zotero.preferences.automaticSnapshots "Tomar instantáneas automáticamente al crear elementos a partir de páginas Web">
+<!ENTITY zotero.preferences.downloadAssociatedFiles "Adjuntar automáticamente los archivos PDF y de otros tipos al guardar elementos">
+<!ENTITY zotero.preferences.automaticTags "Marcar elementos automáticamente con palabras clave y cabeceras de asunto">
+<!ENTITY zotero.preferences.trashAutoEmptyDaysPre "Eliminar automáticamente elementos de la papelera que se eliminaron hace más de ">
 <!ENTITY zotero.preferences.trashAutoEmptyDaysPost "días">
 
 <!ENTITY zotero.preferences.groups "Grupos">
-<!ENTITY zotero.preferences.groups.whenCopyingInclude "Al copiar ítems entre bibliotecas, incluir:">
+<!ENTITY zotero.preferences.groups.whenCopyingInclude "Al copiar elementos entre bibliotecas, incluir:">
 <!ENTITY zotero.preferences.groups.childNotes "notas subordinadas">
 <!ENTITY zotero.preferences.groups.childFiles "capturas subordinadas y ficheros importados">
 <!ENTITY zotero.preferences.groups.childLinks "enlaces subordinados">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "etiquetas">
 
 <!ENTITY zotero.preferences.openurl.caption "AbrirURL">
 
@@ -52,55 +53,61 @@
 <!ENTITY zotero.preferences.sync.password "Clave:">
 <!ENTITY zotero.preferences.sync.syncServer "Servidor de sincronización Zotero">
 <!ENTITY zotero.preferences.sync.createAccount "Crear cuenta">
-<!ENTITY zotero.preferences.sync.lostPassword "¿Has perdido la clave?">
+<!ENTITY zotero.preferences.sync.lostPassword "¿Olvidó su contraseña?">
 <!ENTITY zotero.preferences.sync.syncAutomatically "Sincronizar automáticamente">
-<!ENTITY zotero.preferences.sync.about "Sobre la sincronización">
-<!ENTITY zotero.preferences.sync.fileSyncing "Sincronización de ficheros">
+<!ENTITY zotero.preferences.sync.about "Acerca de la sincronización">
+<!ENTITY zotero.preferences.sync.fileSyncing "Sincronización de archivos">
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
-<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Sincronizar los ficheros adjuntos en Mi Biblioteca usando">
-<!ENTITY zotero.preferences.sync.fileSyncing.groups "Sincronizar los ficheros en bibliotecas de grupo usando el almacén Zotero">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
-<!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Al usar el almacén de Zotero, aceptas sus">
+<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Sincronizar los archivos adjuntos en Mi biblioteca usando">
+<!ENTITY zotero.preferences.sync.fileSyncing.groups "Sincronizar los archivos en bibliotecas de grupo usando el almacén Zotero">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
+<!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Al usar el almacén de Zotero, acepta sus">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "términos y condiciones">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Sincronización completa con el servidor Zotero">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Mezclar los datos locales de Zotero con los del servidor, descartando el historial de sincronización.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Restaurar desde el servidor Zotero">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer.desc "Eliminar toda la información local Zotero y restaurar del servidor de sincronización.">
 <!ENTITY zotero.preferences.sync.reset.restoreToServer "Restaurar al servidor Zotero">
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Borrar toda la información del servidor y sobreescribir con la información local de Zotero.">
-<!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Reajustar la historia de sincronización de archivo">
+<!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Restablecer el historial de sincronización de archivo">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Forzar la comprobación del servidor de almacenamiento de todos los archivos adjuntos locales.">
-<!ENTITY zotero.preferences.sync.reset.button "Reajustar...">
+<!ENTITY zotero.preferences.sync.reset "Reset">
+<!ENTITY zotero.preferences.sync.reset.button "Restablecer…">
 
 
 <!ENTITY zotero.preferences.prefpane.search "Búsqueda">
 <!ENTITY zotero.preferences.search.fulltextCache "Copia local para búsquedas a texto completo">
-<!ENTITY zotero.preferences.search.pdfIndexing "Indizado de PDF">
-<!ENTITY zotero.preferences.search.indexStats "Estadísticas de indizado">
+<!ENTITY zotero.preferences.search.pdfIndexing "Indización de PDF">
+<!ENTITY zotero.preferences.search.indexStats "Estadísticas de indización">
 
 <!ENTITY zotero.preferences.search.indexStats.indexed "Indizados:">
 <!ENTITY zotero.preferences.search.indexStats.partial "Parciales:">
 <!ENTITY zotero.preferences.search.indexStats.unindexed "No indizados:">
 <!ENTITY zotero.preferences.search.indexStats.words "Palabras:">
 
-<!ENTITY zotero.preferences.fulltext.textMaxLength "Máximo de caracteres indizados por fichero:">
-<!ENTITY zotero.preferences.fulltext.pdfMaxPages "Máximo de páginas indizadas por fichero:">
+<!ENTITY zotero.preferences.fulltext.textMaxLength "Máximo de caracteres indizados por archivo:">
+<!ENTITY zotero.preferences.fulltext.pdfMaxPages "Máximo de páginas indizadas por archivo:">
 
 <!ENTITY zotero.preferences.prefpane.export "Exportar">
 
 <!ENTITY zotero.preferences.citationOptions.caption "Opciones de cita">
-<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Incluir los URLs de los artículos en las referencias">
-<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "Sin esta opción, Zotero sólo incluye los URLs al citar artículos de revistas y periódicos si el artículo no tiene un intervalo de páginas especificado.">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Incluir los URL de los artículos en las referencias">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "Sin esta opción, Zotero solo incluye los URL al citar artículos de revistas y periódicos si el artículo no tiene un intervalo de páginas especificado.">
 
 <!ENTITY zotero.preferences.quickCopy.caption "Copia rápida">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Formato de salida normal:">
 <!ENTITY zotero.preferences.quickCopy.copyAsHTML "Copiar como HTML">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Nota: en Mac OS X, el texto se copiará sin formato.">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.setings "Ajustes específicos del sitio:">
-<!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath "Dominio/camino">
+<!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath "Dominio/ruta">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(p.ej. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Formato de salida">
-<!ENTITY zotero.preferences.quickCopy.dragLimit "Deshabilitar Copiado rápido cuando arrastre más de">
+<!ENTITY zotero.preferences.quickCopy.dragLimit "Desactivar Copia rápida cuando arrastre más de">
 
 <!ENTITY zotero.preferences.prefpane.cite "Citar">
 <!ENTITY zotero.preferences.cite.styles "Estilos">
@@ -114,13 +121,14 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Título">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Actualizado">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Obtener estilos adicionales...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Atajos de teclado">
 
 <!ENTITY zotero.preferences.keys.openZotero "Abrir/cerrar el panel de Zotero">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Conmutar el modo de pantalla completa">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "Enfocar el panel de bibliotecas">
 <!ENTITY zotero.preferences.keys.quicksearch "Búsqueda rápida">
 <!ENTITY zotero.preferences.keys.newItem "Crear un nuevo ítem">
 <!ENTITY zotero.preferences.keys.newNote "Crear una nueva nota">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Cualquier cadena">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avanzadas">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Localizar">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Administrador de motor de búsqueda de artículo">
@@ -168,11 +177,17 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Mostrar opción de codificación de caracteres en la exportación">
 
 <!ENTITY zotero.preferences.dataDir "Lugar de almacenamiento">
-<!ENTITY zotero.preferences.dataDir.useProfile "Usar el directorio del perfil de usuario en Firefox">
+<!ENTITY zotero.preferences.dataDir.useProfile "Usar el directorio del perfil de usuario">
 <!ENTITY zotero.preferences.dataDir.custom "Especial:">
 <!ENTITY zotero.preferences.dataDir.choose "Elegir...">
 <!ENTITY zotero.preferences.dataDir.reveal "Mostrar el directorio de datos">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Mantenimiento de la base de datos">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Comprobar la integridad de la base de datos">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Restablecer los traductores y estilos...">
diff --git a/chrome/locale/es-ES/zotero/standalone.dtd b/chrome/locale/es-ES/zotero/standalone.dtd
index ec8b26e549..399385c9cd 100644
--- a/chrome/locale/es-ES/zotero/standalone.dtd
+++ b/chrome/locale/es-ES/zotero/standalone.dtd
@@ -12,12 +12,12 @@
 
 <!ENTITY fileMenu.label "Archivo">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "Guardar…">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
+<!ENTITY pageSetupCmd.label "Configuración de página…">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "Imprimir…">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "U">
 <!ENTITY closeCmd.label "Cerrar">
diff --git a/chrome/locale/es-ES/zotero/zotero.dtd b/chrome/locale/es-ES/zotero/zotero.dtd
index 688c85955b..2d99945de9 100644
--- a/chrome/locale/es-ES/zotero/zotero.dtd
+++ b/chrome/locale/es-ES/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Editar">
 <!ENTITY zotero.general.delete "Borrar">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "El informe de errores puede incluir mensajes sin relación con Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Por favor, espera mientras se envía el informe de error.">
 <!ENTITY zotero.errorReport.submitted "Se ha enviado el informe de error.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Envía un mensaje a los foros de Zotero (forums.zotero.org) con este identificador de informe, una descripción del problema, y los pasos necesarios para repetirlo.">
 <!ENTITY zotero.errorReport.notReviewed "Los informes de error, en general, no se revisan a menos que se los mencione en los foros.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Has instalado una versión nueva de Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Tu base de datos de Zotero debe actualizarse para funcionar con la versión nueva.">
 <!ENTITY zotero.upgrade.autoBackup "Se hará una copia de seguridad de tu base de datos antes de hacer cambios.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Derechos">
 <!ENTITY zotero.items.dateAdded_column "Fecha de adición">
 <!ENTITY zotero.items.dateModified_column "Fecha de modificación">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Mostrar en la biblioteca">
 <!ENTITY zotero.items.menu.attach.note "Añadir nota">
@@ -68,10 +86,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restaurar a la biblioteca">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicar el ítem seleccionado">
-<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+<!ENTITY zotero.items.menu.mergeItems "Combinar elementos…">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
-<!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "Elija la versión del elemento a usa como el elemento maestro">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "Seleccione los campos a conservar de otras versiones del ítem:">
 
 <!ENTITY zotero.toolbar.newItem.label "Nuevo ítem">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Más">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transformar texto">
 <!ENTITY zotero.item.textTransform.titlecase "Capitalización De Título">
 <!ENTITY zotero.item.textTransform.sentencecase "Capitalización de oración">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nueva nota">
 <!ENTITY zotero.toolbar.note.standalone "Nueva nota independiente">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Seleccionar las visibles">
 <!ENTITY zotero.tagSelector.clearVisible "Descartar las visibles">
 <!ENTITY zotero.tagSelector.clearAll "Sin selección">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Cambiar nombre...">
 <!ENTITY zotero.tagSelector.deleteTag "Borrar marca...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Introduce el ISBN, DOI o PMID para buscar en la caja de abajo.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Seleccionar ítems">
 <!ENTITY zotero.selectitems.intro.label "Marca los ítems que te apetezca añadir a tu biblioteca">
@@ -132,9 +159,9 @@
 
 <!ENTITY zotero.bibliography.title "Crear bibliografía">
 <!ENTITY zotero.bibliography.style.label "Estilo de cita:">
-<!ENTITY zotero.bibliography.outputMode "Output Mode:">
-<!ENTITY zotero.bibliography.bibliography "Bibliography">
-<!ENTITY zotero.bibliography.outputMethod "Output Method:">
+<!ENTITY zotero.bibliography.outputMode "Modo de salida:">
+<!ENTITY zotero.bibliography.bibliography "Bibliografía">
+<!ENTITY zotero.bibliography.outputMethod "Método de salida:">
 <!ENTITY zotero.bibliography.saveAsRTF.label "Guardar como RTF">
 <!ENTITY zotero.bibliography.saveAsHTML.label "Guardar como HTML">
 <!ENTITY zotero.bibliography.copyToClipboard.label "Copiar al portapapeles">
@@ -143,7 +170,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Ajustes de documento">
 <!ENTITY zotero.integration.addEditCitation.title "Añadir o modificar cita">
 <!ENTITY zotero.integration.editBibliography.title "Modificar bibliografía">
-<!ENTITY zotero.integration.quickFormatDialog.title "Quick Format Citation">
+<!ENTITY zotero.integration.quickFormatDialog.title "Formato rápido de cita">
 
 <!ENTITY zotero.progress.title "Progreso">
 
@@ -162,7 +189,7 @@
 <!ENTITY zotero.citation.suppressAuthor.label "Omitir el autor">
 <!ENTITY zotero.citation.prefix.label "Prefijo:">
 <!ENTITY zotero.citation.suffix.label "Sufijo:">
-<!ENTITY zotero.citation.editorWarning.label "Warning: If you edit a citation in the editor it will no longer update to reflect changes in your database or the citation style.">
+<!ENTITY zotero.citation.editorWarning.label "Aviso: Si modifica una cita en el editor, no se actualizará más para reflejar los cambios en su base de datos o en el estilo de cita.">
 
 <!ENTITY zotero.richText.italic.label "Itálica">
 <!ENTITY zotero.richText.bold.label "Negrita">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Etiquetas sin marcar no serán guardadas.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "La etiqueta será borrada de todos los ítems.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Proxy reconocido">
 <!ENTITY zotero.proxy.recognized.warning "Solo agregue proxies enlazados desde su biblioteca, escuela o sitio corporativo">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Agregando otros proxies permite a sitios maliciosos a enmascararse como sitios que Usted confía.">
diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties
index 6787e6bbe0..41dea628e9 100644
--- a/chrome/locale/es-ES/zotero/zotero.properties
+++ b/chrome/locale/es-ES/zotero/zotero.properties
@@ -11,9 +11,12 @@ general.restartRequiredForChange=%S debe reiniciarse para que se realice el camb
 general.restartRequiredForChanges=%S debe reiniciarse para que se realicen los cambios.
 general.restartNow=Reiniciar ahora
 general.restartLater=Reiniciar más tarde
-general.restartApp=Restart %S
+general.restartApp=Reiniciar %S
 general.errorHasOccurred=Ha ocurrido un error.
 general.unknownErrorOccurred=Ha ocurrido un error desconocido.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Por favor reinicia %S.
 general.restartFirefoxAndTryAgain=Por favor reinicia %S y prueba de nuevo.
 general.checkForUpdate=Comprobar si hay actualizaciones
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Mira en %S para más información
 general.enable=Activar
 general.disable=Desactivar
 general.remove=Eliminar
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Abrir documentación
-general.numMore=%S more…
+general.numMore=%S más…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Una operación de Zotero se encuentra en progreso.
 general.operationInProgress.waitUntilFinished=Espera hasta que termine.
@@ -53,7 +60,7 @@ install.quickStartGuide.message.thanks=Gracias por instalar Zotero.
 
 upgrade.failed.title=Ha fallado la actualización
 upgrade.failed=La actualización de la base de datos de Zotero ha fallado:
-upgrade.advanceMessage=Pulse %S para actualizar ahora.
+upgrade.advanceMessage=Pulsa %S para actualizar ahora.
 upgrade.dbUpdateRequired=La base de datos de Zotero tiene que actualizarse.
 upgrade.integrityCheckFailed=Tu base de datos de Zotero necesita repararse para que la actualización pueda continuar.
 upgrade.loadDBRepairTool=Cargar la herramienta de reparación de bases de datos
@@ -68,13 +75,33 @@ errorReport.advanceMessage=Pulsa %S para enviar un informe de error a los creado
 errorReport.stepsToReproduce=Pasos para reproducirlo:
 errorReport.expectedResult=Resultado esperado:
 errorReport.actualResult=Resultado real:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=No se encuentra el directorio de datos de Zotero.
 dataDir.previousDir=Directorio anterior:
-dataDir.useProfileDir=Usar el directorio de perfil de Firefox
+dataDir.useProfileDir=Usar el directorio de perfil de %S
 dataDir.selectDir=Elige un directorio de datos para Zotero
 dataDir.selectedDirNonEmpty.title=El directorio no está vacío
 dataDir.selectedDirNonEmpty.text=El directorio que has seleccionado no está vacío y no parece que sea un directorio de datos de Zotero.\n\n¿Deseas crear los ficheros de Zotero ahí de todas formas?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Se ha encontrado una Biblioteca de Zotero preexistente
 dataDir.standaloneMigration.description=Parece que es la primera vez que usas %1$S. ¿Te gustaría que %1$S importe la configuración de %2$S y usar tu directorio de datos existente?
 dataDir.standaloneMigration.multipleProfiles=%1$S compartirá su directorio de datos con el perfil usado más recientemente.
@@ -90,7 +117,7 @@ startupError.closeFirefox=Si Firefox con la extensión de Zotero está abierto,
 startupError.databaseCannotBeOpened=No puedo abrir la base de datos de Zotero.
 startupError.checkPermissions=Asegúrate de tener permiso de lectura y escritura en el directorio de datos de Zotero.
 startupError.zoteroVersionIsOlder=Esta versión de Zotero es anterior a la versión usada con tu base de datos.
-startupError.zoteroVersionIsOlder.upgrade=Actualizalo a la última versión en zotero.org.
+startupError.zoteroVersionIsOlder.upgrade=Actualízalo a la última versión en zotero.org.
 startupError.zoteroVersionIsOlder.current=Versión actual: %S
 startupError.databaseUpgradeError=Error de actualización de la base de datos
 
@@ -114,10 +141,11 @@ pane.collections.newSavedSeach=Nueva carpeta de búsqueda
 pane.collections.savedSearchName=Nombre para esta carpeta de búsqueda:
 pane.collections.rename=Renombrar colección:
 pane.collections.library=Mi biblioteca
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Papelera
 pane.collections.untitled=Sin título
 pane.collections.unfiled=Ítems sin archivar
-pane.collections.duplicate=Duplicate Items
+pane.collections.duplicate=Ítems duplicados
 
 pane.collections.menu.rename.collection=Renombrar la colección...
 pane.collections.menu.edit.savedSearch=Modificar la carpeta de búsqueda
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=¿Seguro que quieres borrar esta marca?\n\nLa ma
 pane.tagSelector.numSelected.none=Ninguna seleccionada
 pane.tagSelector.numSelected.singular=%S marca seleccionada
 pane.tagSelector.numSelected.plural=%S marcas seleccionadas
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Cargando la lista de ítems...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Enviar a la papelera
 pane.items.trash=¿Seguro que quieres enviar el ítem a la papelera?
 pane.items.trash.multiple=¿Seguro que quieres enviar los ítems a la papelera?
@@ -176,10 +210,15 @@ pane.items.interview.manyParticipants=Entrevista por %S et al.
 
 pane.item.selected.zero=Ningún ítem seleccionado
 pane.item.selected.multiple=%S ítems seleccionados
-pane.item.unselected.zero=No items in this view
-pane.item.unselected.singular=%S item in this view
-pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+pane.item.unselected.zero=No hay ítems en esta vista
+pane.item.unselected.singular=%S ítem en esta vista
+pane.item.unselected.plural=%S ítems en esta vista
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Cambiar el tipo de ítem
 pane.item.changeType.text=¿Seguro que quieres cambiar el tipo de ítem?\n\nLos siguientes campos se perderán:
@@ -188,8 +227,8 @@ pane.item.defaultLastName=último
 pane.item.defaultFullName=nombre completo
 pane.item.switchFieldMode.one=Cambiar a campo simple
 pane.item.switchFieldMode.two=Cambiar a dos campos
-pane.item.creator.moveUp=Move Up
-pane.item.creator.moveDown=Move Down
+pane.item.creator.moveUp=Subir
+pane.item.creator.moveDown=Bajar
 pane.item.notes.untitled=Nota sin título
 pane.item.notes.delete.confirm=¿Seguro que quieres borrar esta nota?
 pane.item.notes.count.zero=Ninguna nota.
@@ -198,21 +237,22 @@ pane.item.notes.count.plural=%S notas:
 pane.item.attachments.rename.title=Nuevo título:
 pane.item.attachments.rename.renameAssociatedFile=Renombrar el archivo asociado
 pane.item.attachments.rename.error=Ha ocurrido un error al renombrar el archivo.
-pane.item.attachments.fileNotFound.title=Fichero no encontrado
-pane.item.attachments.fileNotFound.text=No se encuentra el fichero adjunto.\n\nPuede haber sido movido o borrado fuera de Zotero.
+pane.item.attachments.fileNotFound.title=Archivo no encontrado
+pane.item.attachments.fileNotFound.text=No se encuentra el archivo adjunto.\n\nPuede haber sido movido o borrado fuera de Zotero.
 pane.item.attachments.delete.confirm=¿Seguro que quieres borrar este adjunto?
 pane.item.attachments.count.zero=%S adjuntos:
 pane.item.attachments.count.singular=%S adjunto:
 pane.item.attachments.count.plural=%S adjuntos:
 pane.item.attachments.select=Elige un archivo
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=pulsa aquí
-pane.item.tags=Marcas:
 pane.item.tags.count.zero=%S marcas:
 pane.item.tags.count.singular=%S marca:
 pane.item.tags.count.plural=%S marcas:
 pane.item.tags.icon.user=Marca definida por el usuario
 pane.item.tags.icon.automatic=Marca automática
-pane.item.related=Relacionado:
 pane.item.related.count.zero=%S relacionados:
 pane.item.related.count.singular=%S relacionado:
 pane.item.related.count.plural=%S relacionados:
@@ -410,12 +450,13 @@ fileTypes.document=Documento
 save.attachment=Guardando instantánea...
 save.link=Guardando enlace...
 save.link.error=Ha ocurrido un error guardando este enlace.
-save.error.cannotMakeChangesToCollection=No puede hacer cambios a la actual colección.
-save.error.cannotAddFilesToCollection=No puede agregar archivos a la actual colección.
+save.error.cannotMakeChangesToCollection=No puedes hacer cambios a la actual colección.
+save.error.cannotAddFilesToCollection=No puedes agregar archivos a la actual colección.
 
 ingester.saveToZotero=Guardar en Zotero
 ingester.saveToZoteroUsing=Guardar en Zotero usando "%S"
 ingester.scraping=Guardando ítem...
+ingester.scrapingTo=Saving to
 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.
@@ -423,11 +464,12 @@ ingester.scrapeErrorDescription.linkText=Problemas conocidos del traductor
 ingester.scrapeErrorDescription.previousError=La grabación ha fallado debido a un error anterior en Zotero.
 
 ingester.importReferRISDialog.title=Importador Zotero RIS/Remitir
-ingester.importReferRISDialog.text=Quiere importar ítems desde "%1$S" dentro Zotero?\n\nPuede deshabilitar la importación automática RIS/Refer en las preferencias de Zotero.
+ingester.importReferRISDialog.text=¿Quieres importar ítems desde "%1$S" dentro Zotero?\n\nPuedes deshabilitar la importación automática RIS/Refer en las preferencias de Zotero.
 ingester.importReferRISDialog.checkMsg=Permitir siempre para este sitio
 
 ingester.importFile.title=Importar archivo
 ingester.importFile.text=¿Quieres importar el archivo "%S"?\n\nLos ítems se agregarán a una nueva colección.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Realizando búsqueda...
 ingester.lookup.error=Ha ocurrido un error mientras se realizaba la búsqueda de este ítem.
@@ -441,20 +483,33 @@ db.dbRestoreFailed=La base de datos de Zotero '%S' parece haberse corrompido, y
 db.integrityCheck.passed=No se han encontrado errores en la base de datos.
 db.integrityCheck.failed=Se han encontrado errores en la base de datos de Zotero.
 db.integrityCheck.dbRepairTool=Puedes usar la herramienta de reparación de base de datos en http://zotero.org/utils/dbfix para intentar corregir estos errores.
-db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
-db.integrityCheck.appRestartNeeded=%S will need to be restarted.
-db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
-db.integrityCheck.errorsFixed=The errors in your Zotero database have been corrected.
-db.integrityCheck.errorsNotFixed=Zotero was unable to correct all the errors in your database.
-db.integrityCheck.reportInForums=You can report this problem in the Zotero Forums.
+db.integrityCheck.repairAttempt=Zotero puede intentar corregir estos errores.
+db.integrityCheck.appRestartNeeded=Se necesita reiniciar %S.
+db.integrityCheck.fixAndRestart=Corregir los errores y reiniciar %S
+db.integrityCheck.errorsFixed=Se han corregido los errores en tu base de datos de Zotero.
+db.integrityCheck.errorsNotFixed=Zotero no ha podido corregir todos los errores en tu base de datos.
+db.integrityCheck.reportInForums=Puedes informar de este problema en los Foros de Zotero.
 
 zotero.preferences.update.updated=Actualizado
 zotero.preferences.update.upToDate=Actualizado
 zotero.preferences.update.error=Error
-zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when possible
+zotero.preferences.launchNonNativeFiles=Abrir PDFs y otros ficheros dentro de %S cuando sea posible
 zotero.preferences.openurl.resolversFound.zero=Ningún resolutor encontrado
 zotero.preferences.openurl.resolversFound.singular=%S resolutor encontrado
 zotero.preferences.openurl.resolversFound.plural=%S resolutores encontrados
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Reconstruir índice
 zotero.preferences.search.rebuildWarning=¿Quieres reconstruir el índice entero? Puede tardar un rato.\n\nPara indizar sólo ítems nuevos, usa %S.
 zotero.preferences.search.clearIndex=Vaciar el índice
@@ -462,7 +517,7 @@ zotero.preferences.search.clearWarning=Tras vaciar el índice, no se podrá busc
 zotero.preferences.search.clearNonLinkedURLs=Vaciar todo excepto los enlaces web
 zotero.preferences.search.indexUnindexed=Indizar los ítems nuevos
 zotero.preferences.search.pdf.toolRegistered=%S está instalado
-zotero.preferences.search.pdf.toolNotRegistered=%S no está instalado
+zotero.preferences.search.pdf.toolNotRegistered=%S NO está instalado
 zotero.preferences.search.pdf.toolsRequired=El indizado de PDF require las utilidades %1$S y %2%S del proyecto %3$S.
 zotero.preferences.search.pdf.automaticInstall=Zotero puede descargar e instalar automáticamente estas aplicaciones desde zotero.org en ciertas plataformas.
 zotero.preferences.search.pdf.advancedUsers=Usuarios avanzados: véase el %S para instrucciones de instalación manual.
@@ -481,7 +536,7 @@ zotero.preferences.search.pdf.tryAgainOrViewManualInstructions=Prueba de nuevo m
 zotero.preferences.export.quickCopy.bibStyles=Estilos bibliográficos
 zotero.preferences.export.quickCopy.exportFormats=Formatos de exportación
 zotero.preferences.export.quickCopy.instructions=La copia rápida te permite copiar referencias seleccionadas al portapapeles pulsando un atajo (%S) o arrastrando ítems a una casilla de texto en una página web.
-zotero.preferences.export.quickCopy.citationInstructions=For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
+zotero.preferences.export.quickCopy.citationInstructions=Para estilos bibliográficos, puedes copiar las citas o pies de página presionando %S o manteniendo pulsada la tecla Mayúsculas antes de arrastrar los ítems.
 zotero.preferences.styles.addStyle=Agregar estilo
 
 zotero.preferences.advanced.resetTranslatorsAndStyles=Restablecer los traductores y estilos
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Se perderán los traduc
 zotero.preferences.advanced.resetStyles=Restablecer estilos
 zotero.preferences.advanced.resetStyles.changesLost=Se perderán los estilos añadidos o modificados.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Ya existían los siguientes ficheros en el directorio de destino, y no se han copiado:
 dragAndDrop.filesNotFound=No se han encontrado los siguientes ficheros, y no han podido ser copiados:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importar
 fileInterface.export=Exportar
 fileInterface.exportedItems=Ítems exportados
 fileInterface.imported=Importado
-fileInterface.fileFormatUnsupported=No se ha encontrado traductor para el archivo dado.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Bibliografía sin título
 fileInterface.bibliographyHTMLTitle=Bibliografía
 fileInterface.importError=Ha ocurrido un error al intentar importar el archivo seleccionado. Asegúrate de que el archivo es válido y prueba de nuevo.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Los ítems que has seleccionado no contienen ref
 fileInterface.bibliographyGenerationError=Ha ocurrido un error al generar tu bibliografía. Prueba de nuevo.
 fileInterface.exportError=Ha ocurrido un error al intentar exportar el archivo seleccionado.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Modo de búsqueda avanzada — pulsa Intro para buscar.
 searchInProgress=Búsqueda en marcha — espera, por favor.
 
@@ -556,7 +620,7 @@ fulltext.indexState.partial=Parcial
 
 exportOptions.exportNotes=Exportar notas
 exportOptions.exportFileData=Exportar archivos
-exportOptions.useJournalAbbreviation=Use Journal Abbreviation
+exportOptions.useJournalAbbreviation=Usar abreviatura de la revista
 charset.UTF8withoutBOM=Unicode (UTF-8 sin BOM)
 charset.autoDetect=(autodetectar)
 
@@ -572,8 +636,8 @@ citation.multipleSources=Fuentes múltiples...
 citation.singleSource=Fuente única...
 citation.showEditor=Mostrar editor...
 citation.hideEditor=Ocultar editor...
-citation.citations=Citations
-citation.notes=Notes
+citation.citations=Citas
+citation.notes=Notas
 
 report.title.default=Informe de Zotero
 report.parentItem=Ítem contenedor:
@@ -600,7 +664,7 @@ integration.regenerate.body=Se perderán los cambios hechos en el editor de cita
 integration.regenerate.saveBehavior=Seguir siempre esta selección.
 
 integration.revertAll.title=¿Seguro que quieres revertir todas las ediciones a tu bibliografía?
-integration.revertAll.body=Si eliger continuar, todas las referencias citadas en el texto aparecerán en la bibliografía con su texto original, y todas las referencias agregadas manualmente serán eliminadas de la bibliografía.
+integration.revertAll.body=Si eliges continuar, todas las referencias citadas en el texto aparecerán en la bibliografía con su texto original, y todas las referencias agregadas manualmente serán eliminadas de la bibliografía.
 integration.revertAll.button=Revertir todo
 integration.revert.title=¿Seguro que quieres revertir esta edición?
 integration.revert.body=Si eliges continuar, el texto de las entradas de bibliografía correspondiente a los items seleccionados será reemplazado con el texto sin modificar especificado por el estilo seleccionado.
@@ -613,6 +677,7 @@ integration.cited.loading=Cargando ítems citados...
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Cita en blanco
 integration.emptyCitationWarning.body=La cita que has especificado estaría vacía en el estilo seleccionado actualmente. ¿Seguro que quieres agregarla?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Esta versión del complemento de Zotero para procesador de textos  ($INTEGRATION_VERSION) es incompatible con la versión de Zotero instalada actualmente (%1$S). Por favor verifica que estás utilizando la última versión de ambos componentes.
 integration.error.incompatibleVersion2=Zotero %1$S requiere %2$S %3$S o posterior. Por favor descarga la última versión de %2$S desde zotero.org.
@@ -623,36 +688,44 @@ integration.error.mustInsertCitation=Debes insertar una cita antes de realizar e
 integration.error.mustInsertBibliography=Debes insertar una bibliografía antes de realizar esta operación.
 integration.error.cannotInsertHere=No se pueden insertar campos de Zotero aquí.
 integration.error.notInCitation=Debes colocar el cursor en una cita de Zotero para editarla.
-integration.error.noBibliography=El estilo bibliográfico actual no define una bibliografía. Si desea agregar una bibliografía, por favor elija otro estilo.
-integration.error.deletePipe=El conducto que Zotero utiliza para comunicar con el procesador de texto no se pudo inicializar. Desea que Zotero intente corregir este error? Se le alertará por su contraseña.
-integration.error.invalidStyle=El estilo que ha seleccionado no parece ser válido. Si ha creado este estilo por sí mismo, por favor asegúrese de que traspasa la validación, como se describe en http://zotero.org/support/dev/citation_styles. Alternativamente, intente seleccionar otro estilo.
-integration.error.fieldTypeMismatch=Zotero no puede actualizar este documento porque fue creado por una aplicación de procesamiento de texto con una codificación de campo incompatible. Con el fin de hacer un documento compatible con Word y OpenOffice.org/LibreOffice/NeoOffice, abra el documento en el procesador de textos con el que se creó originalmente y cambie el tipo de campo a Favoritos en las preferencias del documento Zotero.
+integration.error.noBibliography=El estilo bibliográfico actual no define una bibliografía. Si deseas agregar una bibliografía, por favor elige otro estilo.
+integration.error.deletePipe=El conducto que Zotero utiliza para comunicar con el procesador de texto no se pudo inicializar. ¿Deseas que Zotero intente corregir este error? Te pedirá tu contraseña.
+integration.error.invalidStyle=El estilo que ha seleccionado no parece ser válido. Si has creado este estilo por tí mismo, por favor asegúrate de que pasa la validación, como se describe en http://zotero.org/support/dev/citation_styles. Alternativamente, intenta seleccionar otro estilo.
+integration.error.fieldTypeMismatch=Zotero no puede actualizar este documento porque fue creado por una aplicación de procesamiento de texto con una codificación de campo incompatible. Con el fin de hacer un documento compatible con Word y OpenOffice.org/LibreOffice/NeoOffice, abre el documento en el procesador de textos con el que se creó originalmente y cambia el tipo de campo a Favoritos en las preferencias del documento Zotero.
 
 integration.replace=¿Reemplazar este campo de Zotero?
 integration.missingItem.single=Este ítem ya no existe en tu base de datos de Zotero. ¿Quieres seleccionar un ítem para sustituirlo?
 integration.missingItem.multiple=El ítem %1$S en esta cita ya no existe en tu base de datos de Zotero. ¿Quieres seleccionar un ítem para sustituirlo?
-integration.missingItem.description=Clickeando "No" borrará los códigos de campo para citas conteniendo este ítem, manteniendo el texto de la cita pero borrándolo de su bibliografía.
-integration.removeCodesWarning=Quitando los códigos de campo evitará a Zotero de actualizar citas y bibliografías en sus documentos. Está seguro que desea continuar?
+integration.missingItem.description=Al pulsar "No" borrarás los códigos de campo para citas conteniendo este ítem, manteniendo el texto de la cita pero borrándolo de tu bibliografía.
+integration.removeCodesWarning=Quitando los códigos de campo impedirás que Zotero de actualice citas y bibliografías en este documento. ¿Estás seguro de que deseas continuar?
 integration.upgradeWarning=Tu documento debe ser actualizado de versión de manera permanente para poder funcionar con Zotero 2.1 o posterior. Se recomienda hacer una copia de seguridad antes de proceder. ¿Seguro que quieres continuar?
-integration.error.newerDocumentVersion=Su documento fue creato con una versión más moderna de Zotero (%1$S) que su actual versión instalada (%1$S). Por favor, actualice Zotero antes de editar este documento.
-integration.corruptField=El código de campo Zotero correspondiente a esta cita, el cual señala a Zotero qué ítem en su biblioteca esta cita representa, se ha dañado. ¿Le gustaría volver a seleccionar este ítem?
-integration.corruptField.description=Clickeando "No" borrará los códigos de campo para las citas conteniendo este ítem, preservando este texto de cita pero potencialmente borrándolo de su bibliografía.
-integration.corruptBibliography=El código de campo Zotero en su bibliografía está corrupto. Debería Zotero borrar este código de campo y generar una nueva bibliografía?
-integration.corruptBibliography.description=Todos los ítems citado en el texto aparecerán en la nueva bibliografía, pero las modificaciones que realice en el cuadro de diálogo "Editar Bibliografía" serán perdidas.
-integration.citationChanged=Ha modificado esta cita desde que  Zotero la generó. Quiere mantener sus modificaciones y prevenir futuras actualizaciones?
-integration.citationChanged.description=Clickeando en "Si" evitará a Zotero de actualizar esta cita si agrega citas adicionales, cambia citas o modifica la referencia al cual refiere. Clickeando "No" borrará sus cambios.
-integration.citationChanged.edit=Ha modificado esta cita desde que Zotero la generó. Editándola borrará sus modificaciones. Desea continuar?
+integration.error.newerDocumentVersion=Tu documento fue creado con una versión más moderna de Zotero (%1$S) que la versión instalada actualmente (%1$S). Por favor, actualiza Zotero antes de editar este documento.
+integration.corruptField=El código de campo Zotero correspondiente a esta cita, el cual señala a Zotero qué ítem en su biblioteca esta cita representa, se ha dañado. ¿Te gustaría volver a seleccionar este ítem?
+integration.corruptField.description=Al pulsar "No" borrarás los códigos de campo para las citas conteniendo este ítem, preservando este texto de cita pero potencialmente borrándolo de tu bibliografía.
+integration.corruptBibliography=El código de campo Zotero en tu bibliografía está corrupto. ¿Debería Zotero borrar este código de campo y generar una nueva bibliografía?
+integration.corruptBibliography.description=Todos los ítems citados en el texto aparecerán en la nueva bibliografía, pero las modificaciones que realices en el cuadro de diálogo "Editar Bibliografía" se perderán.
+integration.citationChanged=Has modificado esta cita desde que  Zotero la generó. ¿Quieres mantener tus modificaciones e impedir futuras actualizaciones?
+integration.citationChanged.description=Al pulsar "Si" impedirás que Zotero actualice esta cita si agregas citas adicionales, cambias citas o modificas la referencia al cual refiere. Al pulsar "No" borrarás tus cambios.
+integration.citationChanged.edit=Has modificado esta cita desde que Zotero la generó. Editándola borrarás tus modificaciones. ¿Deseas continuar?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=¿Instalar el estilo "%1$S" desde %2$S?
 styles.updateStyle=¿Actualizar el estilo existente "%1$S" con "%2$S" desde %3$S?
 styles.installed=El estilo "%S" se ha instalado correctamente.
-styles.installError=%S no parecer ser un archivo válido de estilo.
+styles.installError=%S no parece ser un archivo válido de estilo.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S referencia un archivo CSL inválido o inexistente en %2$S como su origen.
 styles.deleteStyle=¿Seguro que quieres borrar el estilo "%1$S"?
 styles.deleteStyles=¿Seguro que quieres borrar los estilos seleccionados?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancelar sincronización
-sync.openSyncPreferences=Open Sync Preferences...
+sync.openSyncPreferences=Abrir preferencias de sincronización
 sync.resetGroupAndSync=Reajustar grupo y sincronizar
 sync.removeGroupsAndSync=Quitar grupos y sincronizar
 sync.localObject=Objeto local
@@ -660,31 +733,71 @@ sync.remoteObject=Objeto remoto
 sync.mergedObject=Unir objeto
 
 sync.error.usernameNotSet=Nombre de usuario no provisto
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Contraseña no provista
 sync.error.invalidLogin=Nombre de usuario o contraseña inválida
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Por favor, ingrese una contraseña.
-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.loginManagerCorrupted1=Zotero no puede acceder a su información de inicio de sesión, probablemente debido a que esté corrupta la base de datos de gestión de inicios de sesión de %S.
+sync.error.loginManagerCorrupted2=Cierra %1$S, haz copia de seguridad y borra signons.* de tu perfil %2$S, y reintroduce tu información de inicio de sesión en Zotero en el panel Sincronización de las preferencias de Zotero.
 sync.error.syncInProgress=Una operación de sincronización ya está en marcha.
-sync.error.syncInProgress.wait=Wait for the previous sync to complete or restart %S.
-sync.error.writeAccessLost=Ya no posee licencia para escribir en el grupo Zotero '%S', y sus archivos que ha agregado o editado no pueden ser sincronizados con el servidor.
-sync.error.groupWillBeReset=Si continua, su copia del grupo reajustará su estado en el servidor, y las modificaciones locales a los ítems y archivos serán perdidos.
-sync.error.copyChangedItems=Si le gustaría tener la oportunidad de copiar los cambios en otra parte o solicitar  acceso de escritura desde un administrador de grupo, cancele la sincronización ahora.
+sync.error.syncInProgress.wait=Espera a que se complete la sincronización anterior o reinicia %S.
+sync.error.writeAccessLost=Ya no posees permiso para escribir en el grupo Zotero '%S', y los archivos que has agregado o editado no pueden ser sincronizados con el servidor.
+sync.error.groupWillBeReset=Si continúas, tu copia del grupo reajustará su estado en el servidor, y las modificaciones locales a los ítems y archivos se perderán.
+sync.error.copyChangedItems=Si te gustaría tener la oportunidad de copiar los cambios en otra parte o solicitar  acceso de escritura a un administrador de grupo, cancela la sincronización ahora.
 sync.error.manualInterventionRequired=Una sincronización automática resultó en un conflicto, lo cual requiere una intervención manual.
-sync.error.clickSyncIcon=Clic en el ícono Sincronizar para sincronizar manualmente.
+sync.error.clickSyncIcon=Pulsa el icono Sincronizar para sincronizar manualmente.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Aún sin sincronizar
 sync.status.lastSync=Última sincronización:
-sync.status.loggingIn=Registrándome con el servidor de sincronización
+sync.status.loggingIn=Iniciando sesión en el servidor de sincronización
 sync.status.gettingUpdatedData=Obteniendo datos actualizados del servidor de sincronización
 sync.status.processingUpdatedData=Procesando los datos actualizados
 sync.status.uploadingData=Subiendo los datos al servidor de sincronización
 sync.status.uploadAccepted=Subida aceptada — esperando al servidor de sincronización
 sync.status.syncingFiles=Sincronizando ficheros
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB restantes
 sync.storage.filesRemaining=%1$S/%2$S archivos
 sync.storage.none=Ninguno
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Fichero local
 sync.storage.remoteFile=Fichero remoto
 sync.storage.savedFile=Fichero guardado
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Verificada la configuración del servid
 sync.storage.fileSyncSetUp=Ajustado correctamente el fichero de sincronización.
 sync.storage.openAccountSettings=Abrir ajustes de la cuenta
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=No puedo llegar al servidor %S.
 sync.storage.error.permissionDeniedAtAddress=No tienes permiso para crear un directorio de Zotero en la siguiente dirección:
 sync.storage.error.checkFileSyncSettings=Comprueba tus ajustes de fichero de sincronización o informa al administrador de tu servidor.
 sync.storage.error.verificationFailed=Falló la verificación de %S. Comprueba tus ajustes de fichero de sincronización en el panel "Sincronización" de las preferencias de Zotero.
 sync.storage.error.fileNotCreated=El archivo '%S' no se pudo crear en el directorio 'storage' de Zotero.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Ya no tienes acceso a modificar ficheros en el grupo Zotero '%S', y los ficheros que has añadido o modificado no pueden sincronizarse con el servidor.
 sync.storage.error.copyChangedItems=Si quieres tener la oportunidad de copiar los ítems y fichero cambiados a otro sitio, debes cancelar la sincronización ahora.
 sync.storage.error.fileUploadFailed=Falló la subida del fichero.
 sync.storage.error.directoryNotFound=No encuentro el directorio
 sync.storage.error.doesNotExist=No existe %S
 sync.storage.error.createNow=¿Quieres crearlo ahora?
-sync.storage.error.webdav.enterURL=Necesito un URL WebDAV.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S no es un URL WebDAV válido.
 sync.storage.error.webdav.invalidLogin=El servidor WebDAV no ha aceptado el nombre y clave que has introducido.
 sync.storage.error.webdav.permissionDenied=No tienes permiso para acceder a %S en el servidor WebDAV.
@@ -711,50 +830,71 @@ sync.storage.error.webdav.insufficientSpace=Falló una subida de fichero por fal
 sync.storage.error.webdav.sslCertificateError=Error de certificado SSL al conectar con %S
 sync.storage.error.webdav.sslConnectionError=Error de conexión SSL al conectar con %S
 sync.storage.error.webdav.loadURLForMoreInfo=Carga tu URL WebDAV en el navegador para más información.
-sync.storage.error.webdav.seeCertOverrideDocumentation=Vea la documentación Partida decisiva para una mayor información.
+sync.storage.error.webdav.seeCertOverrideDocumentation=Mira la documentación de sobreescritura de certificado para mayor información.
 sync.storage.error.webdav.loadURL=Cargar la URL del WebDAV
-sync.storage.error.zfs.personalQuotaReached1=Ha alcanzado su cuota de almacenamiento de archivo Zotero. Algunos archivos no se cargaron. Otros datos Zotero continuarán sincronizando con el servidor.
-sync.storage.error.zfs.personalQuotaReached2=Revise la configuración de su cuenta en zotero.org por otras opciones adicionales de almacenaje.
-sync.storage.error.zfs.groupQuotaReached1=El grupo  '%S' ha alcanzado su quota de almacenamiento de archivos Zotero. Algunos archivos no se cargaron. Otros datos Zotero continuarán sincronizando con el servidor.
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
+sync.storage.error.zfs.personalQuotaReached1=Has alcanzado tu cuota de almacenamiento de archivo Zotero. Algunos archivos no se cargaron. Otros datos de Zotero continuarán sincronizándose con el servidor.
+sync.storage.error.zfs.personalQuotaReached2=Revisa la configuración de tu cuenta en zotero.org para opciones adicionales de almacenaje.
+sync.storage.error.zfs.groupQuotaReached1=El grupo  '%S' ha alcanzado su quota de almacenamiento de archivos Zotero. Algunos archivos no se cargaron. Otros datos de Zotero continuarán sincronizándose con el servidor.
 sync.storage.error.zfs.groupQuotaReached2=El propietario del grupo puede aumentar la capacidad de almacenamiento del grupo desde la sección configuración de almacenamiento en zotero.org
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Guardar etiqueta
 sync.longTagFixer.saveTags=Guardar etiquetas
 sync.longTagFixer.deleteTag=Borrar etiqueta
 
 proxies.multiSite=Multi-sitio
-proxies.error=Information Validation Error
+proxies.error=Opciones de proxy inválidas
 proxies.error.scheme.noHTTP=Los esquemas válidos de servidores proxy deben comenzar con  "http://" o "https://"
-proxies.error.host.invalid=Debe ingresar un hostname completo para el sitio alojado por este proxy (ejemplo: jstor.org).
+proxies.error.host.invalid=Debes introducir un nombre de servidor completo para el sitio alojado por este proxy (ejemplo: jstor.org).
 proxies.error.scheme.noHost=El esquema proxy multi-sitio debe contener la variable host  (%h).
 proxies.error.scheme.noPath=Un esquema proxy válido dee contener o la variable path (%p) o las variables directory y filename  (%d y %f).
 proxies.error.host.proxyExists=Ya ha definido otro proxy para el host %1$S.
 proxies.error.scheme.invalid=El esquema proxy ingresado es inválido; y se aplicaría a todos los hosts.
-proxies.notification.recognized.label=Zotero detectó que está accediendo a este sitio a través de un servidor proxy. Le gustaría que las futuras peticiones sean automáticamente redirigidas desde %1$S a través de %2$S?
-proxies.notification.associated.label=Zotero automáticamente asoció este sitio con un proxy previamente definido. Futuras peticiones a %1$S serán redirigidos a %2$S.
+proxies.notification.recognized.label=Zotero detectó que está accediendo a este sitio a través de un servidor proxy. ¿Te gustaría que las futuras peticiones sean automáticamente redirigidas desde %1$S a través de %2$S?
+proxies.notification.associated.label=Zotero automáticamente asoció este sitio con un proxy previamente definido. Futuras peticiones a %1$S serán redirigidas a %2$S.
 proxies.notification.redirected.label=Zotero automáticamente redirigirá su petición a %1$S a través del proxy en %2$S.
-proxies.notification.enable.button=Enable...
-proxies.notification.settings.button=Proxy Settings...
-proxies.recognized.message=Agregando este proxy permitirá a Zotero reconocer ítems desde estas páginas y automaticamente redirigirá futuras peticiones a %1$S a través de %2$S.
+proxies.notification.enable.button=Habilitar...
+proxies.notification.settings.button=Opciones de Proxy...
+proxies.recognized.message=Agregando este proxy permitirá a Zotero reconocer ítems desde estas páginas y automáticamente redirigirá futuras peticiones a %1$S a través de %2$S.
 proxies.recognized.add=Agregar proxy
 
 recognizePDF.noOCR=PDF no contiene texto reconocido por OCR.
 recognizePDF.couldNotRead=No se puede leer texto desde el PDF.
 recognizePDF.noMatches=No hay referencias encontradas.
 recognizePDF.fileNotFound=Archivo no encontrado.
-recognizePDF.limit=Límite de consultas alcanzado. Reinténtelo más tarde.
-recognizePDF.complete.label=Recuperación de metadatos completo.
+recognizePDF.limit=Límite de consultas alcanzado. Reinténtalo más tarde.
+recognizePDF.error=An unexpected error occurred.
+recognizePDF.complete.label=Recuperación de metadatos completa.
 recognizePDF.close.label=Cerrar
 
 rtfScan.openTitle=Seleccionar un archivo a escanear
-rtfScan.scanning.label=Scanning RTF Document...
-rtfScan.saving.label=Formatting RTF Document...
+rtfScan.scanning.label=Escaneando documento RTF...
+rtfScan.saving.label=Formateando documento RTF...
 rtfScan.rtf=Formato de texto enriquecido (.rtf)
 rtfScan.saveTitle=Seleccionar un lugar donde guardar el archivo con formato
 rtfScan.scannedFileSuffix=(Escaneado)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Búsqueda fallida
-lookup.failure.description=Zotero no puede encontrar un registro del identificador especificado. Por favor, verifique el identificador e inténtelo nuevamente.
+lookup.failure.description=Zotero no puede encontrar un registro del identificador especificado. Por favor, verifica el identificador e inténtalo nuevamente.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Ver en línea
 locate.online.tooltip=Ir a este ítem en línea
@@ -771,17 +911,17 @@ locate.internalViewer.tooltip=Abrir archivo en esta aplicación
 locate.showFile.label=Mostrar archivo
 locate.showFile.tooltip=Abrir el directorio en el cual reside el archivo
 locate.libraryLookup.label=Búsqueda biblioteca
-locate.libraryLookup.tooltip=Busque este ítem utilizando el OpenURL seleccionado
-locate.manageLocateEngines=Manage Lookup Engines...
+locate.libraryLookup.tooltip=Busca este ítem utilizando el OpenURL seleccionado
+locate.manageLocateEngines=Gestionar motores de búsqueda...
 
-standalone.corruptInstallation=Su instalación Zotero parece estar corrupta debido a una fallida auto-actualización. Mientras Zotero puede seguir funcionando, para evitar posibles errores, por favor, descargue la última versión de Zotero en http://zotero.org/support/standalone tan pronto como sea posible.
-standalone.addonInstallationFailed.title=Instalación de complemento fallada
+standalone.corruptInstallation=Tu instalación Zotero parece estar corrupta debido a una fallida auto-actualización. Aunque Zotero puede seguir funcionando, para evitar posibles errores, por favor, descarga la última versión de Zotero en http://zotero.org/support/standalone tan pronto como sea posible.
+standalone.addonInstallationFailed.title=Instalación de complemento fallida
 standalone.addonInstallationFailed.body=El complemento "%S" no puede ser instalado. Puede ser incompatible con esta versión de Zotero Standalone.
 
 connector.error.title=Error de conector Zotero
-connector.standaloneOpen=Su base de datos no puede ser acceder debido a que Zotero Standalone está actualmente abierta. Por favor, vea sus ítems en Zotero Standalone.
+connector.standaloneOpen=No se puede acceder a tu base de datos debido a que Zotero Standalone está abierto. Por favor, mira tus ítems en Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero fue reconocer una referencia en esta página. Cliquee este ícono
-firstRunGuidance.authorMenu=Zotero le permite también especificar editores y traductores. Puede cambiar el rol de autor a editor o traductor seleccionándolo desde este menú.
-firstRunGuidance.quickFormat=Escriba el título o el autor para buscar una referencia. \n\nDespués que haya hecho su selección, haga clic en la burbuja o pulse Ctrl-\u2193 para agregar números de página, prefijos o sufijos. También puede incluir un número de página junto con sus términos de búsqueda para añadirlo directamente.\n\nPuede editar citas directamente en el documento del procesador de textos.
-firstRunGuidance.quickFormatMac=Escriba el título o el autor para buscar una referencia. \n\nDespués que haya hecho su selección, haga clic en la burbuja o pulse Cmd-\u2193 para agregar números de página, prefijos o sufijos. También puede incluir un número de página junto con sus términos de búsqueda para añadirlo directamente.\n\nPuede editar citas directamente en el documento del procesador de textos.
+firstRunGuidance.saveIcon=Zotero ha reconocido una referencia en esta página. Pulse este icono en la barra de direcciones para guardar la referencia en tu bibliografía de Zotero.
+firstRunGuidance.authorMenu=Zotero te permite también especificar editores y traductores. Puedes cambiar el rol de autor a editor o traductor seleccionándolo desde este menú.
+firstRunGuidance.quickFormat=Escribe el título o el autor para buscar una referencia. \n\nDespués de que hayas hecho tu selección, haz clic en la burbuja o pulsa Ctrl-\u2193 para agregar números de página, prefijos o sufijos. También puedes incluir un número de página junto con tus términos de búsqueda para añadirlo directamente.\n\nPuedes editar citas directamente en el documento del procesador de textos.
+firstRunGuidance.quickFormatMac=Escribe el título o el autor para buscar una referencia. \n\nDespués de que hayas hecho tu selección, haz clic en la burbuja o pulsa Cmd-\u2193 para agregar números de página, prefijos o sufijos. También puedes incluir un número de página junto con tus términos de búsqueda para añadirlo directamente.\n\nPuedes editar citas directamente en el documento del procesador de textos.
diff --git a/chrome/locale/et-EE/zotero/about.dtd b/chrome/locale/et-EE/zotero/about.dtd
index b72c91537a..5fe74439a2 100644
--- a/chrome/locale/et-EE/zotero/about.dtd
+++ b/chrome/locale/et-EE/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Tänud:">
 <!ENTITY zotero.about.close "Sulge">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Veel autoreid ja tänusõnu">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/et-EE/zotero/preferences.dtd b/chrome/locale/et-EE/zotero/preferences.dtd
index a5f1083b43..c29a25760d 100644
--- a/chrome/locale/et-EE/zotero/preferences.dtd
+++ b/chrome/locale/et-EE/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Vaikimisi:">
 <!ENTITY zotero.preferences.items "kirjet">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Üldine">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Minu raamatukogus olevate lisade sünkroonimine kasutades">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Minu grupi raamatukogus olevate lisade sünkroonimine kasutades Zotero hoidlat">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Kasutades Zotero hoidlat, nõustute järgmiste">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "tingimuste ja piirangutega">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Zotero serveriga täissünkroonimine">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Liita kohalikele Zotero andmetele sünkroon-serveris olevad andmed, jättes tähelepanuta sünkroonimise ajaloo">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Taastada Zotero serverist">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Kustutada kõik sünkroon-serveri andmed ja taastada need kohalikust hoidlast">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Algseadistada failide sünkroonimise ajalugu">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Rakendada hoidla serveri kontrolli kõigi kohalikele lisatud failidele.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Algseadistada...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Pealkiri">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Uuendatud">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Veel stiile...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Kiirvaliku klahvid">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Suvaline string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Täpsemalt">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Otsing">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Artikli otsingumootori haldaja">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Valida...">
 <!ENTITY zotero.preferences.dataDir.reveal "Andmete kataloogi näitamine">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Andmebaasi hooldus">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Andmebaasi sidususe kontroll">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Alglaadida tõlkijad ja stiilid...">
diff --git a/chrome/locale/et-EE/zotero/standalone.dtd b/chrome/locale/et-EE/zotero/standalone.dtd
index f468e49dce..f8335a79a5 100644
--- a/chrome/locale/et-EE/zotero/standalone.dtd
+++ b/chrome/locale/et-EE/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Sulgeda">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
diff --git a/chrome/locale/et-EE/zotero/zotero.dtd b/chrome/locale/et-EE/zotero/zotero.dtd
index fb00b01f9c..5b435b2ae5 100644
--- a/chrome/locale/et-EE/zotero/zotero.dtd
+++ b/chrome/locale/et-EE/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Toimetada">
 <!ENTITY zotero.general.delete "Kustutada">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Vealogi võib sisaldada teateid, mis ei puutu Zoterosse.">
 <!ENTITY zotero.errorReport.submissionInProgress "Palun oodake kuni veateadet saadetakse.">
 <!ENTITY zotero.errorReport.submitted "Teie veateade on saadetud.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Palun postitage teade foorumisse (forums.zotero.org) koos veateate ID-ga ja kirjeldusega, millistel asjaoludel probleem esineb ning mis seda iseloomustab.">
 <!ENTITY zotero.errorReport.notReviewed "Veateadetega, millest ei ole foorumites teada antud, üldjuhul ei tegeleta.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Paigaldasite uue Zotero versiooni.">
 <!ENTITY zotero.upgrade.upgradeRequired "Et Zotero andmebaas töötaks uue versiooniga on seda tarvis uuendada.">
 <!ENTITY zotero.upgrade.autoBackup "Enne muudatuste tegemist varundatakse olemasolev andmebaas automaatselt.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Õigused">
 <!ENTITY zotero.items.dateAdded_column "Lisamise kuupäev">
 <!ENTITY zotero.items.dateModified_column "Muutmise kuupäev">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Näidata raamatukogus">
 <!ENTITY zotero.items.menu.attach.note "Märkuse lisamine">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Teksti muutmine">
 <!ENTITY zotero.item.textTransform.titlecase "Suurteks Algustähtedeks">
 <!ENTITY zotero.item.textTransform.sentencecase "Lause tõst">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Uus märkus">
 <!ENTITY zotero.toolbar.note.standalone "Uus sõltumatu märkus">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Valida nähtav">
 <!ENTITY zotero.tagSelector.clearVisible "Nähtava valiku eemaldamine">
 <!ENTITY zotero.tagSelector.clearAll "Ära vali midagi">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Lipiku ümbernimetamine...">
 <!ENTITY zotero.tagSelector.deleteTag "Lipiku kustutamine...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Sisestada otsitava ISBN, DOI või PMID allolevasse lahtrisse.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Kirjete valimine">
 <!ENTITY zotero.selectitems.intro.label "Valida millised kirjeid soovite lisada raamatukokku">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Valimata lipikuid ei salvestata.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Lipik kustutatakse kõigilt kirjetelt.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Proksi omaks võetud.">
 <!ENTITY zotero.proxy.recognized.warning "Lisage vaid oma raamatukogust, koolist või firmast lähtuvaid proksisid">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Teiste prokside lisamine võib kujutada turvariski.">
diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties
index 44ded11f48..791f2dc804 100644
--- a/chrome/locale/et-EE/zotero/zotero.properties
+++ b/chrome/locale/et-EE/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Alglaadida hiljem
 general.restartApp=Restart %S
 general.errorHasOccurred=Tekkis viga.
 general.unknownErrorOccurred=Tundmatu viga.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Palun Firefox alglaadida.
 general.restartFirefoxAndTryAgain=Palun Firefox alglaadida ja siis uuesti proovida.
 general.checkForUpdate=Uuenduste kontrollimine
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Edasise info tarbeks vaadake %S.
 general.enable=Lubada
 general.disable=Keelata
 general.remove=Eemaldada
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Dokumentatsiooni avamine
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Zotero parajasti toimetab.
 general.operationInProgress.waitUntilFinished=Palun oodake kuni see lõpeb.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Veateate saatmiseks Zotero arendajatele vajutage %S.
 errorReport.stepsToReproduce=Kuidas viga tekib:
 errorReport.expectedResult=Loodetud tulemus:
 errorReport.actualResult=Tegelik tulemus:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Zotero andmete kataloogi ei leitud.
 dataDir.previousDir=Eelmine kataloog:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Kasutada Firefoxi profiili kataloogi
 dataDir.selectDir=Zotero andmete kataloogi valimine
 dataDir.selectedDirNonEmpty.title=Kataloog ei ole tühi
 dataDir.selectedDirNonEmpty.text=Kataloog, mille valisite ei ole ilmselt tühi ja ei ole ka Zotero andmete kataloog.\n\nLuua Zotero failid sellest hoolimata sinna kataloogi?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Zotero uuendamise teadaanne
 dataDir.standaloneMigration.description=Paistab, et kasutate esmakordselt %1$St. Kas soovite %1$Si laadida seaded %2$Sst ja kasutada olemasolevat andmete kataloogi?
 dataDir.standaloneMigration.multipleProfiles=%1$S jagab andmete kataloogi viimati kasutatud profiiliga.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Uus salvestatud otsing
 pane.collections.savedSearchName=Pange salvestatud otsingule nimi:
 pane.collections.rename=Nimetage teema ümber:
 pane.collections.library=Minu raamatukogu
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Praht
 pane.collections.untitled=Nimeta
 pane.collections.unfiled=Teemata kirjed
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Soovite kindlasti lipikut kustutada?\n\nLipik ee
 pane.tagSelector.numSelected.none=0 lipikut valitud
 pane.tagSelector.numSelected.singular=%S lipik valitud
 pane.tagSelector.numSelected.plural=%S lipikut valitud
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Kirjete nimekirja laadimine...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Liiguta Prahi hulka
 pane.items.trash=Olete kindel, et soovite valitud kirje Prahi hulka liigutada?
 pane.items.trash.multiple=Olete kindel, et soovite valitud kirjed Prahi hulka liigutada?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S kirjet valitud
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Kirje tüübi muutmine
 pane.item.changeType.text=Soovite kindlasti selle kirje tüüpi muutma?\n\nJärgnevad väljad kustutatakse:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S manust:
 pane.item.attachments.count.singular=%S manus:
 pane.item.attachments.count.plural=%S manust:
 pane.item.attachments.select=Faili valimine
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=vajutage siia
-pane.item.tags=Lipikud:
 pane.item.tags.count.zero=%S lipikut:
 pane.item.tags.count.singular=%S lipik:
 pane.item.tags.count.plural=%S lipikut:
 pane.item.tags.icon.user=Kasutaja poolt lisatud lipik
 pane.item.tags.icon.automatic=Automaatselt lisatud lipik
-pane.item.related=Seotud:
 pane.item.related.count.zero=%S seotut:
 pane.item.related.count.singular=%S seotud:
 pane.item.related.count.plural=%S seotut:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Valitud teemasse ei ole võimalik kirjeid
 ingester.saveToZotero=Salvestada Zoterosse
 ingester.saveToZoteroUsing=Salvestada Zoterosse kasutades "%S"
 ingester.scraping=Kirje salvestamine...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Kirje salvestatud
 ingester.scrapeError=Kirje salvestamine ei õnnestunud
 ingester.scrapeErrorDescription=Selle kirje salvestamisel tekkis viga. Lisainformatsiooniks vaadake %S.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=Selle saidi puhul alati lubada
 
 ingester.importFile.title=Faili importimine
 ingester.importFile.text=Soovite importida faili "%S"?\n\nKirjed lisatakse uude teemasse.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Teostan otsimist...
 ingester.lookup.error=Selle kirje otsimisel tekkis viga.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S lahendajat leitud
 zotero.preferences.openurl.resolversFound.singular=%S lahendaja leitud
 zotero.preferences.openurl.resolversFound.plural=%S lahendajat leitud
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Indeksi taasloomine
 zotero.preferences.search.rebuildWarning=Soovite kogu indeksi taasluua? See võib võtta aega.\n\nEt indekseerida vaid kirjed, mis on indekseerimata, kasutage %S.
 zotero.preferences.search.clearIndex=Indeksi tühjendamine
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Kõik uued või muudetu
 zotero.preferences.advanced.resetStyles=Stiilid alglaadida
 zotero.preferences.advanced.resetStyles.changesLost=Kõik uued või muudetud stiilid lähevad kaotsi.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Järgnevad failid olid juba kataloogis ning neid ei kopeeritud:
 dragAndDrop.filesNotFound=Järgnevad faile ei leitud ning neid ei saanud kopeerida:
 
@@ -500,7 +559,8 @@ fileInterface.import=Import
 fileInterface.export=Eksport
 fileInterface.exportedItems=Eksporditud kirjed
 fileInterface.imported=Imporditud
-fileInterface.fileFormatUnsupported=Antud faili jaoks ei leitud tõlkijat.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Nimetu biblograafia
 fileInterface.bibliographyHTMLTitle=Biblograafia
 fileInterface.importError=Valitud faili importimisel tekkis viga. Veenduge, et tegemist on õige failiga ning proovige uuesti.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Kirjed, mida te olete valinud, ei sisalda viitei
 fileInterface.bibliographyGenerationError=Bibliograafia loomisel tekkis viga. Palun proovige uuesti.
 fileInterface.exportError=Valitud faili eksportimisel tekkis viga.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Ekspertotsing — vajutage otsimiseks vajutage sisesta (Enter).
 searchInProgress=Toimub otsimine — palun oodake.
 
@@ -613,6 +677,7 @@ integration.cited.loading=Tsiteeritud kirjete laadimine...
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Tühi viide.
 integration.emptyCitationWarning.body=Viide, mille valisite, oleks praeguse viitestiili järgi tühi. Olete kindel, et soovite seda lisada?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=See versioon Zotero tesktiredaktori pluginist ($INTEGRATION_VERSION) ei ühildu Zotero Firefoxi lisaga (%1$S). Palun neid uuendada.
 integration.error.incompatibleVersion2=Zotero %1$S nõuab %2$S %3$S või hilisemat. Palun laadige %2$S alla zotero.org lehelt.
@@ -643,14 +708,22 @@ integration.citationChanged=Viidet on muudetud pärast seda kui Zotero on selle
 integration.citationChanged.description=Kui jah, siis edaspidi Zotero ei uuenda seda viidet ka juhul, kui lisate viiteid, vahetate stiile või muudate seda kirjet Zotero baasis. Kui valite "Ei", siis Zotero kustutab praegused muudatused. 
 integration.citationChanged.edit=Viidet on muudetud pärast seda kui Zotero on selle loonud. Redigeerimine kustutab teie muudatused. Kas soovite jätkata? 
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Paigaldada stiil "%1$S" asukohast %2$S?
 styles.updateStyle=uuendada olemasolevat stiili "%1$S" stiiliks "%2$S" asukohast %3$S?
 styles.installed=Stiili "%S" paigaldamine õnnestus.
 styles.installError=%S näib olevat vigane.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S viitab vigasele või puuduvale CSL failile %2$S.
 styles.deleteStyle=Olete kindel, et soovite stiili "%1$S" kustutada?
 styles.deleteStyles=Olete kindel, et soovite neid stiile kustutada?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Lõpeta sync
 sync.openSyncPreferences=Sync eelistused
 sync.resetGroupAndSync=Algseadista Grupp ja Sync
@@ -660,8 +733,10 @@ sync.remoteObject=Serveri objekt
 sync.mergedObject=Liidetud objekt
 
 sync.error.usernameNotSet=Kasutajanimi ei ole määratud
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Salasõna ei ole määratud
 sync.error.invalidLogin=Vigane kasutajanimi või salasõna
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Palun sisestada salasõna.
 sync.error.loginManagerCorrupted1=Zotero ei saa sisse logimisega hakkama, ilmselt Firefoxi salvestatud salasõna vea tõttu.
 sync.error.loginManagerCorrupted2=Sulgege Firefox, tehke varukoopia ja kustutage enda Firefoxi profiilist salvestatud sisselogimise info. Seejärel sisestage enda info uuesti Zotero seadetes.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Kui jätkate, taastatakse grupi raamatukogu sellest
 sync.error.copyChangedItems=Kui soovite salvestada tehtud muudatused kuhugi mujale või taodelda muutmisõigust grupi administraatori käest, katkestage sünkroonimine.
 sync.error.manualInterventionRequired=Automaatne sünkroonimine põhjustas konflikti, mis nõuab teie sekkumist.
 sync.error.clickSyncIcon=Sünkroonimiseks vajutage sünkroonimise ikooni.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Sünkroonimist ei ole toimunud
 sync.status.lastSync=Viimane sünkroonimine:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Andmete laadimine serverisse
 sync.status.uploadAccepted=Suhtlus serveriga
 sync.status.syncingFiles=Andmete sünkroonimine
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=jäänud on %SKB
 sync.storage.filesRemaining=%1$S/%2$S faili
 sync.storage.none=Midagi
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Kohalik fail
 sync.storage.remoteFile=Serveris asuv fail
 sync.storage.savedFile=Salvestatud fail
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Serveri seadistamine kinnitatud
 sync.storage.fileSyncSetUp=Failide sünkroonimise seadistamine edukas
 sync.storage.openAccountSettings=Avada konto seaded
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Server %S ei ole kättesaadav
 sync.storage.error.permissionDeniedAtAddress=Sellel aadressil ei ole teil õigust luua Zotero kataloogi:
 sync.storage.error.checkFileSyncSettings=Palun kontrollida sünkroonimise seaded või võtke ühendust serveri administraatoriga.
 sync.storage.error.verificationFailed=%S konnitamine ebaõnnestus. Kontrollige sünkroonimise seaded Zotero seadete alt.
 sync.storage.error.fileNotCreated=Faili "%S" ei ole võimalik Zotero hoidlas luua.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Teil ei ole enam ligipääsu Zotero grupp "%S"-le ning lisatud või muudetud faile ei ole võimaik serverisse sünkroniseerida.
 sync.storage.error.copyChangedItems=Kui soovite salvestada tehtud muudatused kuhugi mujale, katkestage sünkroonimine.
 sync.storage.error.fileUploadFailed=Faili üleslaadimine ebaõnnestus.
 sync.storage.error.directoryNotFound=Kataloogi ei leitud
 sync.storage.error.doesNotExist=%S ei leidu.
 sync.storage.error.createNow=Kas soovite seda luua?
-sync.storage.error.webdav.enterURL=Sisestage WebDAV URL.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S ei ole korrektne WebDAV URL.
 sync.storage.error.webdav.invalidLogin=WebDAV server ei tunnista sisestatud kasutajanime ja salasõna.
 sync.storage.error.webdav.permissionDenied=Teil puudub WebDAV serveris ligipääs %S-le.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=%S ühendumisel tekkis SSL ühendus
 sync.storage.error.webdav.loadURLForMoreInfo=Edasiseks infoks laadige WebDAV URL brauseris.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Lisainfoks vaadake sertifikaadi tühistamise dokumentatsiooni.
 sync.storage.error.webdav.loadURL=WebDAV URL laadimine
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Zotero serveris teile eraldatud laoruum on täis saanud. Mõningaid faile ei laaditud üles, ülejäänud zotero andmeid aga sünkroonitakse endiselt.
 sync.storage.error.zfs.personalQuotaReached2=Suurema laoruumi saamiseks vaadake enda zotero.org kontot.
 sync.storage.error.zfs.groupQuotaReached1=Grupp '%S' on ära kasutanud serveris eraldatud laoruumi. Mõningaid faile ei laaditud üles, ülejäänud zotero andmeid aga sünkroonitakse endiselt.
 sync.storage.error.zfs.groupQuotaReached2=Grupi omanik saab laoruumi suurendada.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Salvestada lipik
 sync.longTagFixer.saveTags=Salvestada lipikud
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=PDFist ei õnnetstu teksti lugeda.
 recognizePDF.noMatches=Sobivaid vasteid ei leitud.
 recognizePDF.fileNotFound=Faili ei leitud.
 recognizePDF.limit=Päringulimiit saavutatud. Palun hiljem uuesti proovida.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metaandmete kogumine lõppenud.
 recognizePDF.close.label=Sulgeda
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Valige asukoht, kuhu formateeritud fail salvestada
 rtfScan.scannedFileSuffix=(Skännitud)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Otsing luhtus
 lookup.failure.description=Zotero ei leidnud määratud identifikaatorit. Palun kontrollige identifikaatorit ja proovige uuesti.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Online vaade
 locate.online.tooltip=Selle kirje vaatamine võrgus
diff --git a/chrome/locale/eu-ES/zotero/about.dtd b/chrome/locale/eu-ES/zotero/about.dtd
index 0b56f884e6..6ce5131de9 100644
--- a/chrome/locale/eu-ES/zotero/about.dtd
+++ b/chrome/locale/eu-ES/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Mila esker:">
 <!ENTITY zotero.about.close "Gora askatasuna">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/eu-ES/zotero/preferences.dtd b/chrome/locale/eu-ES/zotero/preferences.dtd
index 3aa4248079..1a0565daa7 100644
--- a/chrome/locale/eu-ES/zotero/preferences.dtd
+++ b/chrome/locale/eu-ES/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Lehenetsia:">
 <!ENTITY zotero.preferences.items "itemak">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Orokorra">
 
@@ -59,9 +60,14 @@
 <!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.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.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.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Full Sync with Zotero Server">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Datu-base lokala eta zerbitzarikoa batu, sinkronizatze-kronika bastertuz.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Datu-basea zerbitzaritik jeitsi">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Ezabatu zerbitzariko datu-basea eta igo fitxategi lokalak.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Garbitu Sync kronika">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Force checking of the storage server for all local attachment files.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reset...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Estilo gehialgo instalatu...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Teklatu-komandoak">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Any string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Advanced">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Choose...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
diff --git a/chrome/locale/eu-ES/zotero/standalone.dtd b/chrome/locale/eu-ES/zotero/standalone.dtd
index f63a223052..e02c6a5a54 100644
--- a/chrome/locale/eu-ES/zotero/standalone.dtd
+++ b/chrome/locale/eu-ES/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/eu-ES/zotero/zotero.dtd b/chrome/locale/eu-ES/zotero/zotero.dtd
index 93e00da8a7..f72184170c 100644
--- a/chrome/locale/eu-ES/zotero/zotero.dtd
+++ b/chrome/locale/eu-ES/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Editatu">
 <!ENTITY zotero.general.delete "Ezabatu">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!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.">
 <!ENTITY zotero.errorReport.submitted "Your error report has been submitted.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Please post a message to the Zotero forums (forums.zotero.org) with this Report ID, a description of the problem, and any steps necessary to reproduce it.">
 <!ENTITY zotero.errorReport.notReviewed "Error reports are not reviewed unless referred to in the forums.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Zotero-ren bertsio berria instalatu egin duzu.">
 <!ENTITY zotero.upgrade.upgradeRequired "Zure Zotero datu-basea eguneratu behar da bertsio berriarekin erabili ahal izateko.">
 <!ENTITY zotero.upgrade.autoBackup "Zure oraingo datu-basea gorde egingo da inolako aldaketarik egin baino lehen..">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Jabetza">
 <!ENTITY zotero.items.dateAdded_column "Noiz gehitua">
 <!ENTITY zotero.items.dateModified_column "Noiz aldatua">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Bilatu liburutegian">
 <!ENTITY zotero.items.menu.attach.note "Oharra gehitu">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Testua bihurtu">
 <!ENTITY zotero.item.textTransform.titlecase "letra larria">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "New Note">
 <!ENTITY zotero.toolbar.note.standalone "Ohar solte berria...">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Agerikoak hautatu">
 <!ENTITY zotero.tagSelector.clearVisible "Agerikoak desautatu">
 <!ENTITY zotero.tagSelector.clearAll "Guztiak desautatu">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Esteka izenaz aldatu...">
 <!ENTITY zotero.tagSelector.deleteTag "Esteka ezabatu...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Kuadroan ISBN, DOI, edo PMID zenbakia sartu:">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Hautatu Itemak">
 <!ENTITY zotero.selectitems.intro.label "Hautatu liburutegira gehitu nahi dituzun Itemak">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Desautatutako estekak ez dira gordeko.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Esteka hau Item guztietatik kenduko da.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Proxy onartuta">
 <!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/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties
index 5d46c45af5..56ed59be1f 100644
--- a/chrome/locale/eu-ES/zotero/zotero.properties
+++ b/chrome/locale/eu-ES/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Berrabiarazi gero
 general.restartApp=Restart %S
 general.errorHasOccurred=Errore bat gertatu da.
 general.unknownErrorOccurred=Errore ezezagun bat gertatu da.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Berrabiarazi ezazu Firefox.
 general.restartFirefoxAndTryAgain=Berrabiarazi ezazu Firefox eta saiatu berriro.
 general.checkForUpdate=Bilatu eguneraketak
@@ -35,8 +38,12 @@ general.seeForMoreInformation=%S-en informazio gehiago duzu.
 general.enable=Gaitu
 general.disable=Ezgaitu
 general.remove=Remove
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Zotero lanean ari da.
 general.operationInProgress.waitUntilFinished=Itxaren ezazu bukatu arte.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Sakatu %S Zotero garatzaileei errore-txostena bidaltz
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Zotero datu basea ezin da aurkitu.
 dataDir.previousDir=Aurreko kokalekua:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Zure "Firefox profile" karpeta erabili
 dataDir.selectDir=Datu-baseari kokalekua ezarri
 dataDir.selectedDirNonEmpty.title=Kokalekua ez dago hutsik
 dataDir.selectedDirNonEmpty.text=Hautatu duzun kokalekua ez dago hutsik eta ez dirudi Zotero datu-base batena denik.\n\nSortu Zotero fitxategiak hemen hala ere?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Gordetako bilaketa berria
 pane.collections.savedSearchName=Sartu gordetako bilaketaren izena:
 pane.collections.rename=Aldatu bildumaren izena:
 pane.collections.library=Nire Liburutegia
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Zaborra
 pane.collections.untitled=Titulu gabe
 pane.collections.unfiled=Unfiled Items
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Benetan ezabatu esteka?\n\n Esteka dagozkion ite
 pane.tagSelector.numSelected.none=Estekarik hautatu gabe
 pane.tagSelector.numSelected.singular=%S esteka hautatu
 pane.tagSelector.numSelected.plural=%S esteka hautatu
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=datuak kargatzen ari...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Zaborrara bota
 pane.items.trash=Hautatutako itema zaborrera bota?
 pane.items.trash.multiple=Hautatutako itemak zaborrera bota?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S hautaturiko item
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Aldatu item mota
 pane.item.changeType.text=Benetan item mota alduatu?\n\nOndorengo eremuak galduko dira:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S eranskin:
 pane.item.attachments.count.singular=eranskin %S:
 pane.item.attachments.count.plural=%S eranskin:
 pane.item.attachments.select=Hautatu fitxategi bat
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=klikatu hemen
-pane.item.tags=Estekak:
 pane.item.tags.count.zero=esteka %S:
 pane.item.tags.count.singular=%S esteka:
 pane.item.tags.count.plural=%S esteka:
 pane.item.tags.icon.user=esteka erabiltzaileak sortua
 pane.item.tags.icon.automatic=esteka automatikoki sortua
-pane.item.related=Erlaziodunak:
 pane.item.related.count.zero=%S erlaziodun:
 pane.item.related.count.singular=erlaziodun %S:
 pane.item.related.count.plural=%S erlaziodun:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Zotero-n gorde
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=Itema gordetzen ari...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Itema gorde egin da.
 ingester.scrapeError=Itema ezin izan da gorde.
 ingester.scrapeErrorDescription=Errore bat gertatu da gordetzekotan. Sakatu %S gehiago jakiteko.
@@ -427,7 +468,8 @@ ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S resolvers found
 zotero.preferences.openurl.resolversFound.singular=%S resolver found
 zotero.preferences.openurl.resolversFound.plural=%S resolvers found
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Rebuild Index
 zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
 zotero.preferences.search.clearIndex=Clear Index
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Any new or modified tra
 zotero.preferences.advanced.resetStyles=Reset Estiloak
 zotero.preferences.advanced.resetStyles.changesLost=Aldatutako estiloak eta estilo berriak galdu egingo dira.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Ondorengo fitxategiak kopiatzeko kokalekuan izenkideak izanez, ez dira kopiatu:
 dragAndDrop.filesNotFound=Ondornego fitxategiak ez dira aurkitu ezta kopiatu:
 
@@ -500,7 +559,8 @@ fileInterface.import=Inporta
 fileInterface.export=Esporta
 fileInterface.exportedItems=Esportatuko itemak
 fileInterface.imported=Inportatukoa
-fileInterface.fileFormatUnsupported=No translator could be found for the given file.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Izengabeko Bibliografia
 fileInterface.bibliographyHTMLTitle=Bibliografia
 fileInterface.importError=Errore bat gertatu da fitxategia inportatzekotan. Egiaztatu fitxategiaren balioa eta saiatu berriro.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Zuk hautatutako itemek ez dute erreferentziarik
 fileInterface.bibliographyGenerationError=Errore bat gertatu da bibliografia sortzekotan. Saiatu berriro.
 fileInterface.exportError=Errore bat gertatu da fitxategia esportatzekotan.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Bilaketa aurreratua - Sakatu SARTU bilatzeko.
 searchInProgress=Bilaketa burutzen ari - itxaron mesedez.
 
@@ -613,11 +677,12 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Aipamen hutsa
 integration.emptyCitationWarning.body=Zuk zehaztu duzun erreferentzia hutsik geratuko litzateke oraingo estiloaren arabera. Benetan gehitu?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Errorea
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Errorea eguneratzekotan.
 integration.error.mustInsertCitation=Sartu aipamen bat, ez dago ezer eta!
 integration.error.mustInsertBibliography=Lehenik, Bibliografiaren kokalekua hautatu behar da
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Instalatu "%1$S" estilo %2$S-tik?
 styles.updateStyle=Eguneratu dagoen "%1$S" estilo "%2$S" %3$S-tik erabiliz?
 styles.installed="%S" estiloaren instalaziñoa ongi burutu da.
 styles.installError=%S-ek ez du estilo fitxategi baliorik.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 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?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancel Sync
 sync.openSyncPreferences=Ireki Sync Hobespenak...
 sync.resetGroupAndSync=Reset Group eta Sync
@@ -660,8 +733,10 @@ sync.remoteObject=serbidoreko itema
 sync.mergedObject=proposamen automatikoa
 
 sync.error.usernameNotSet=Erabiltzaile izena ezarri gabe
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Pasahitza ezarri gabe
 sync.error.invalidLogin=Erabiltzailea edo pasahitza okerra
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Sartu pasahitza, mesedez
 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.
@@ -670,8 +745,43 @@ sync.error.syncInProgress.wait=Itxaron hura bukatu arte eta berrabiarazi Firefox
 sync.error.writeAccessLost=You no longer have write access to the Zotero group '%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.manualInterventionRequired=Conflicts have suspended automatic syncing.
 sync.error.clickSyncIcon=Sakatu Sync ikurra eskuz sinkronizatzeko.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Sinkronizatu gabe oraindik
 sync.status.lastSync=Azken Sync:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Datuak zerbitzarira igotzen
 sync.status.uploadAccepted=Upload accepted — waiting for sync server
 sync.status.syncingFiles=Fitxategiak sinkronizatzen ari...
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB falta dira
 sync.storage.filesRemaining=%1$S/%2$S fitxategi
 sync.storage.none=Ezer ez
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Fitxategi lokala
 sync.storage.remoteFile=Zerbitzariko fitxategia
 sync.storage.savedFile=Gordeko den fitxategia
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Server configuration verified
 sync.storage.fileSyncSetUp=OK. File sync is successfully set up.
 sync.storage.openAccountSettings=Ireki Kontu-hobespenak
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=%S zerbitzarira ezin izan da heldu.
 sync.storage.error.permissionDeniedAtAddress=Arazo bat zure baimenekin: 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=%S egiaztapenak huts egin du. Egiaztatu Sync hobespenak Zotero panelean.
 sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=You no longer have file editing access to the Zotero group '%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=Errorea: File upload failed.
 sync.storage.error.directoryNotFound=Errorea: Kokapena ezin aurkitu
 sync.storage.error.doesNotExist=Errorea: %S ez dago.
 sync.storage.error.createNow=Orain sortu?
-sync.storage.error.webdav.enterURL=Sartu WebDAV URL bat.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S-ek ez du balio WebDAV URL gisa.
 sync.storage.error.webdav.invalidLogin=WebDAV zerbitzariak zure erabiltzailea eta pasahitza ukatu egin ditu
 sync.storage.error.webdav.permissionDenied=Errorea: You don't have permission to access %S on the WebDAV server.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=Errorea: SSL connection error conne
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Zuretzat gordetzen den lekua Zotero zerbitzarian gainezka dago. Zenbait fitxategi ez dira hara bidali. Besteak sinkronizatzen jarraituko dira.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1=The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2=The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Gorde Esteka
 sync.longTagFixer.saveTags=Gorde Estekak
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Could not read text from PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=File not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Close
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(Scanned)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/fa/zotero/about.dtd b/chrome/locale/fa/zotero/about.dtd
index aea9282ffa..a5c6a10f50 100644
--- a/chrome/locale/fa/zotero/about.dtd
+++ b/chrome/locale/fa/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "تشکر ویژه از:">
 <!ENTITY zotero.about.close "بستن">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/fa/zotero/preferences.dtd b/chrome/locale/fa/zotero/preferences.dtd
index 7c2557e34d..3f2a9abe6e 100644
--- a/chrome/locale/fa/zotero/preferences.dtd
+++ b/chrome/locale/fa/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "پیش‌فرض:">
 <!ENTITY zotero.preferences.items "آیتم‌">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "عمومی">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "آدرس:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "همزمان‌‌سازی پرونده‌های پیوست در کتابخانه با استفاده از ">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "همزمان‌‌سازی پرونده‌های پیوست در کتابخانه‌های گروهی با استفاده از سامانه ذخیره زوترو (Zotero storage)">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "با استفاده از سامانه ذخیره زوترو (Zotero storage) می‌پذیرید که تابع">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "شرایط و قوانین آن باشید ">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "همزمان‌‌سازی کامل با کارگزار زوترو">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "تلفیق اطلاعات محلی زوترو با اطلاعات کارگزار همزمان‌‌سازی و نادیده گرفتن تاریخچه همزمان‌‌سازی.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "بازیابی از کارگزار زوترو">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "پاک کردن همه اطلاعات و رونویسی با اطلاعات محلی زوترو">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "پاک کردن تاریخچه همزمان‌‌سازی پرونده‌ها">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Force checking of the storage server for all local attachment files.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "بازنشانی...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "عنوان">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "روزآمد">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "دریافت شیوه‌های بیشتر...">
 
 <!ENTITY zotero.preferences.prefpane.keys "کلیدهای میان‌بر">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - هر نوع رشته">
 
 <!ENTITY zotero.preferences.prefpane.advanced "پیشرفته">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "مکان‌یابی">
 <!ENTITY zotero.preferences.locate.locateEngineManager "سامان‌دهی مکان‌یاب مقالات">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "انتخاب...">
 <!ENTITY zotero.preferences.dataDir.reveal "نمایش محل ذخیره اطلاعات">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "رسیدگی به دادگان">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "بررسی یکپارچگی دادگان">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "بازنشانی مترجم‌ها و شیوه‌ها...">
diff --git a/chrome/locale/fa/zotero/standalone.dtd b/chrome/locale/fa/zotero/standalone.dtd
index f63a223052..e02c6a5a54 100644
--- a/chrome/locale/fa/zotero/standalone.dtd
+++ b/chrome/locale/fa/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/fa/zotero/zotero.dtd b/chrome/locale/fa/zotero/zotero.dtd
index 1f647101f8..926024b44d 100644
--- a/chrome/locale/fa/zotero/zotero.dtd
+++ b/chrome/locale/fa/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "ویرایش">
 <!ENTITY zotero.general.delete "حذف">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "گزارش خطا ممکن است شامل پیام‌های غیر مرتبط با زوترو باشد.">
 <!ENTITY zotero.errorReport.submissionInProgress "لطفا تا پایان ارسال گزارش خطا، صبر کنید.">
 <!ENTITY zotero.errorReport.submitted "گزارش خطا ارسال شد.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "لطفا یک پیام به انجمن گفتگوی زوترو به آدرس forums.zotero.org بفرستید که شامل شناسه گزارش، شرحی از مشکل و مراحل لازم برای تولید مجدد آن باشد.">
 <!ENTITY zotero.errorReport.notReviewed "برای بررسی گزارش خطا، حتما باید آن را به انجمن گفتگو ارجاع دهید. در غیر این صورت گزارش بررسی نخواهد شد.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "شما نسخه جدیدی از زوترو را نصب کرده‌اید.">
 <!ENTITY zotero.upgrade.upgradeRequired "برای کار کردن با نسخه جدید، بانک اطلاعات زوترو باید ارتقا یابد.">
 <!ENTITY zotero.upgrade.autoBackup "از بانک اطلاعات موجود، پیش از انجام هر تغییری، به صورت خودکار نسخه پشتیبان تهیه خواهد شد.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "حقوق">
 <!ENTITY zotero.items.dateAdded_column "تاریخ افزودن">
 <!ENTITY zotero.items.dateModified_column "تاریخ تغییر">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "نمایش در کتابخانه">
 <!ENTITY zotero.items.menu.attach.note "افزودن یادداشت">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "تبدیل متن">
 <!ENTITY zotero.item.textTransform.titlecase "حروف اول بزرگ">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "New Note">
 <!ENTITY zotero.toolbar.note.standalone "یادداشت مستقل جدید">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "انتخاب برچسب‌های پیدا">
 <!ENTITY zotero.tagSelector.clearVisible "عدم انتخاب برچسب‌های پیدا">
 <!ENTITY zotero.tagSelector.clearAll "انتخاب هیچ‌کدام">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "تغییر نام برچسب...">
 <!ENTITY zotero.tagSelector.deleteTag "حذف برچسب...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "شابک،‏ DOI یا PMID را برای جستجو در کادر زیر وارد کنید.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "انتخاب آیتم‌‌ها">
 <!ENTITY zotero.selectitems.intro.label "آیتم‌‌های مورد نظر را برای افزودن به کتابخانه انتخاب کنید">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "برچسب‌های انتخاب نشده، ذخیره نخواهند شد.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "برچسب در همه آیتم‌‌ها پاک خواهد شد.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "پیشکار شناسایی شد">
 <!ENTITY zotero.proxy.recognized.warning "فقط پیشکار‌های مرتبط با کتابخانه، شرکت یا دانشگاه خود را بیفزایید.">
 <!ENTITY zotero.proxy.recognized.warning.secondary " افزودن پیشکار‌های متفرقه، ممکن  است به وب‌گاه‌های بدخواه امکان دهد که خود را به صورت منابع قابل اعتماد معرفی کنند.">
diff --git a/chrome/locale/fa/zotero/zotero.properties b/chrome/locale/fa/zotero/zotero.properties
index 6e4e9bddfb..8b85d73ee1 100644
--- a/chrome/locale/fa/zotero/zotero.properties
+++ b/chrome/locale/fa/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=راه‌اندازی مجدد بعدا انجام شود
 general.restartApp=Restart %S
 general.errorHasOccurred=رخداد خطا.
 general.unknownErrorOccurred=خطای ناشناخته.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=لطفا فایرفاکس را دوباره راه‌اندازی کنید.
 general.restartFirefoxAndTryAgain=لطفا فایرفاکس را مجددا راه‌اندازی و دوباره تلاش کنید.
 general.checkForUpdate=گشتن به دنبال روزآمد
@@ -35,8 +38,12 @@ general.seeForMoreInformation=برای اطلاعات بیشتر %S را ببی
 general.enable=فعال
 general.disable=غیرفعال
 general.remove=حذف
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=زوترو در حال انجام کاری است.
 general.operationInProgress.waitUntilFinished=لطفا تا زمان اتمام آن صبر کنید.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=%S را برای ارسال یک گزارش خطا ب
 errorReport.stepsToReproduce=گام‌های مورد نیاز برای تولید دوباره:
 errorReport.expectedResult=نتیجه مورد انتظار:
 errorReport.actualResult=نتیجه واقعی:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=پوشه داده‌های زوترو پیدا نشد.
 dataDir.previousDir=پوشه قبلی:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=استفاده از پوشه پروفایل فایرفاک
 dataDir.selectDir=انتخاب پوشه داده‌های زوترو
 dataDir.selectedDirNonEmpty.title=پوشه خالی نیست
 dataDir.selectedDirNonEmpty.text=پوشه انتخاب شده خالی نیست و به نظر نمی‌رسد که پوشه داده‌های زوترو باشد. \n\n آیا به هرحال می‌خواهید پرونده‌های زوترو در این پوشه ساخته شوند؟
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=تذکر انتقال به زوتروی جدید
 dataDir.standaloneMigration.description=به نظر می‌رسد که بار اولی است که از %1$S استفاده می‌کنید. آیا می‌خواهید %1$S تنظیمات و پوشه داده‌ها شما را از %2$S درون‌برد کند؟
 dataDir.standaloneMigration.multipleProfiles=%1$S پوشه داده‌های خود را با آخرین پروفایل مورد استفاده، به اشتراک خواهد گذاشت.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=جستجوی ذخیره شده جدید
 pane.collections.savedSearchName=یک نام برای این جستجوی ذخیره شده وارد کنید:
 pane.collections.rename=تغییر نام مجموعه:
 pane.collections.library=کتابخانه
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=سطل بازیافت
 pane.collections.untitled=بدون عنوان
 pane.collections.unfiled=آیتم‌های دسته‌بندی نشده
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=آیا واقعا می‌خواهید این ب
 pane.tagSelector.numSelected.none=هیچ برچسبی انتخاب نشده است
 pane.tagSelector.numSelected.singular=یک برچسب انتخاب شده است
 pane.tagSelector.numSelected.plural=%S برچسب انتخاب شده‌اند
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=بار کردن لیست آیتم‌ها...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=انتقال به سطل بازیافت
 pane.items.trash=آیتم‌ انتخاب شده به سطل بازیافت برود؟
 pane.items.trash.multiple=آیتم‌‌های انتخاب شده به سطل بازیافت بروند؟
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S آیتم‌ انتخاب شده
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=تغییر نوع آیتم‌
 pane.item.changeType.text=آیا واقعا می‌خواهید نوع آیتم‌ را عوض کنید؟\n\nاین فیلد‌ها از بین خواهند رفت:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=بدون پیوست:
 pane.item.attachments.count.singular=یک پیوست:
 pane.item.attachments.count.plural=%S پیوست:
 pane.item.attachments.select=انتخاب پرونده
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=کلیک کنید
-pane.item.tags=برچسب‌ها:
 pane.item.tags.count.zero=بدون برچسب:
 pane.item.tags.count.singular=یک برچسب:
 pane.item.tags.count.plural=%S برچسب:
 pane.item.tags.icon.user=برچسب وارد شده توسط کاربر
 pane.item.tags.icon.automatic=برچسب افزوده شده به صورت خودکار
-pane.item.related=مرتبط:
 pane.item.related.count.zero=بدون آیتم‌ مرتبط:
 pane.item.related.count.singular=یک آیتم‌ مرتبط:
 pane.item.related.count.plural=%S آیتم‌ مرتبط:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=ذخیره در زوترو
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=در حال ذخیره...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=ذخیره شد
 ingester.scrapeError=ذخیره امکان‌پذیر نیست
 ingester.scrapeErrorDescription=در زمان ذخیره این آیتم‌، خطایی رخ داد. %S را برای اطلاعات بیشتر چک کنید.
@@ -427,7 +468,8 @@ ingester.importReferRISDialog.text=آیا می‌خواهید آیتم‌ها ا
 ingester.importReferRISDialog.checkMsg=همیشه برای این وب‌گاه، اجازه داده شود
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=هیچ تشخیص‌دهنده‌ای پیدا نشد
 zotero.preferences.openurl.resolversFound.singular=یک تشخیص‌دهنده پیدا شد
 zotero.preferences.openurl.resolversFound.plural=%S تشخیص‌دهنده پیدا شد
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=نوسازی نمایه
 zotero.preferences.search.rebuildWarning=آیا می‌خواهید تمام نمایه را نوسازی کنید؟ این کار احتمالا مدتی طول خواهد کشید. \n\n برای محدود کردن نمایه‌سازی به آیتم‌هایی که هنوز نمایه نشده‌اند، می‌توانید از %S استفاده کنید.
 zotero.preferences.search.clearIndex=پاک کردن نمایه
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=همه مترجم‌ه
 zotero.preferences.advanced.resetStyles=بازنشانی شیوه‌ها
 zotero.preferences.advanced.resetStyles.changesLost=همه شیوه‌های جدید یا اصلاح شده از دست خواهند رفت.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=این پرونده‌ها از قبل در پوشه مقصد وجود داشتند و رونوشت‌برداری نشدند:
 dragAndDrop.filesNotFound=این پرونده‌ها پیدا نشدند و رونوشت برداشتن از آنها ممکن نبود:
 
@@ -500,7 +559,8 @@ fileInterface.import=درون‌برد
 fileInterface.export=صدور
 fileInterface.exportedItems=آیتم‌های صادر شده
 fileInterface.imported=درون‌برد شده
-fileInterface.fileFormatUnsupported=هیچ مترجمی برای پرونده مورد نظر پیدا نشد.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=کتابنامه بدون عنوان
 fileInterface.bibliographyHTMLTitle=کتابنامه
 fileInterface.importError=در حین تلاش برای درون‌برد پرونده انتخاب شده، خطایی رخ داد. لطفا از معتبر بودن پرونده مطمئن شوید و دوباره تلاش کنید.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=آیتم‌هایی که شما انتخاب ک
 fileInterface.bibliographyGenerationError=در زمان تولید کتابنامه، خطایی رخ داد. لطفا دوباره تلاش کنید.
 fileInterface.exportError=در حین تلاش برای صدور پرونده انتخاب شده، خطایی رخ داد.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=جستجوی پیشرفته - برای جستجو Enter را بزنید.
 searchInProgress=در حال جستجو - لطفا صبر کنید.
 
@@ -613,6 +677,7 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=یادکرد خالی
 integration.emptyCitationWarning.body=یادکرد تعیین شده در شیوه فعلی خالی خواهد بود. آیا واقعا می‌خواهید آن را بیفزایید؟
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=این نگارش از افزونه واژه‌پرداز زوترو ($INTEGRATION_VERSION) با نگارش فعلی زوتروی نصب شده در فایرفاکس (%1$S) ناسازگار است. لطفا از نصب آخرین نگارش هر دو برنامه مطمئن شوید.
 integration.error.incompatibleVersion2=زوترو %1$S به %2$S %3$S یا جدیدتر نیاز دارد. لطفا آخرین نسخه %2$S را از  zotero.org بارگیری کنید.
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=شیوه‌نامه "%1$S" از  %2$S نصب شود؟
 styles.updateStyle=شیوه‌نامه "%1$S" با "%2$S" از %3$S روزآمد شود؟
 styles.installed=شیوه‌نامه "%S" با موفقیت نصب شد.
 styles.installError=%S پرونده شیوه‌نامه معتبری نیست.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S به پرونده سی‌اس‌الی در %2$S به عنوان منبع ارجاع میدهد که وجود ندارد یا معتبر نیست‌.
 styles.deleteStyle=آیا واقعا می‌خواهید شیوه‌نامه "%1$S" را حذف کنید؟
 styles.deleteStyles=آقای واقعا می‌خواهید شیوه‌نامه‌های انتخاب شده را حذف کنید؟
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=لغو همزمان‌‌سازی
 sync.openSyncPreferences=باز کردن تنظیمات همزمان‌‌سازی...
 sync.resetGroupAndSync=بازنشانی گروه و همزمان‌‌سازی
@@ -660,8 +733,10 @@ sync.remoteObject=شیء دور
 sync.mergedObject=شیء تلفیقی
 
 sync.error.usernameNotSet=نام کاربری وارد نشده است
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=گذرواژه تنظیم نشده است
 sync.error.invalidLogin=گذرواژه یا نام کاربری درست نیست.
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=لطفا یک گذرواژه وارد کنید.
 sync.error.loginManagerCorrupted1=زوترو نمی‌تواند به اطلاعات لازم برای ورود به وب‌گاه دسترسی پیدا کند. احتمالا این اشکال به خاطر خرابی دادگان ثبت ورود فایرفاکس ایجاد شده است.
 sync.error.loginManagerCorrupted2=فایرفاکس را ببندید و بعد از پشتیبان گرفتن، همه پرونده‌های signons.* را از پوشه پروفایل فایرفاکس پاک کنید و اطلاعات ثبت ورود زوترو را در قسمت مربوط به تنظیمات همزمان‌سازی، از نو وارد کنید.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=اگر ادامه دهید، رونوشت شما ا
 sync.error.copyChangedItems=اگر می‌خواهید از تغییرات خود در جای دیگری، رونوشت بگیرید یا از سرپرست یک گروه، دسترسی برای نوشتن را درخواست کنید، هم‌اکنون همزمان‌سازی را لغو کنید.
 sync.error.manualInterventionRequired=همزمان‌‌سازی خودکار، منجر به ناسازگاری‌ای شده است که به دخالت دستی نیاز دارد.
 sync.error.clickSyncIcon=برای همزمان‌‌سازی دستی، نشانه همزمان‌‌سازی را کلیک کنید.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=هنوز همزمان‌ نشده است
 sync.status.lastSync=آخرین همزمان‌‌سازی:
@@ -682,9 +792,12 @@ sync.status.uploadingData=در حال بارگذاری داده‌ها به کا
 sync.status.uploadAccepted=بارگذاری پذیرفته شد. \u2014 در انتظار کارگزار همزمان‌‌سازی
 sync.status.syncingFiles=در حال همزمان‌‌سازی پرونده‌ها
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB باقی مانده است
 sync.storage.filesRemaining=پرونده‌های %1$S/%2$S
 sync.storage.none=هیچ‌کدام
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=پرونده محلی
 sync.storage.remoteFile=پرونده دور
 sync.storage.savedFile=پرونده ذخیره شده
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=تنظیمات کارگزار تایی
 sync.storage.fileSyncSetUp=تنظیمات همزمان‌‌سازی پرونده با موفقیت انجام شد.
 sync.storage.openAccountSettings=باز کردن تنظیمات حساب کاربری
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=دسترسی به کارگزار %S امکان‌پذیر نیست.
 sync.storage.error.permissionDeniedAtAddress=شما مجوز ساخت پوشه زوترو در این آدرس را ندارید:
 sync.storage.error.checkFileSyncSettings=لطفا تنظیمات همزمان‌‌سازی پرونده‌های خود را بررسی کنید یا با سرپرست کارگزار تماس بگیرید.
 sync.storage.error.verificationFailed=%S تایید نشد. تنظیمات همزمان‌سازی پرونده را در قسمت تنظیمات همزمان‌سازی زوترو، بازبینی کنید.
 sync.storage.error.fileNotCreated=زوترو نتوانست پرونده '%S' را در پوشه 'storage' بسازد.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=شما دیگر به گروه زوترو با نام '%S' دسترسی برای ویرایش ندارید. در نتیجه امکان همزمان‌سازی با کارگزار برای پرونده‌هایی که افزوده‌اید یا ویرایش کرده‌اید، وجود ندارد.
 sync.storage.error.copyChangedItems=اگر می‌خواهید از تغییرات خود در جای دیگری، رونوشت بگیرید یا از سرپرست یک گروه، دسترسی برای نوشتن را درخواست کنید، هم‌اکنون همزمان‌سازی را لغو کنید.
 sync.storage.error.fileUploadFailed=بارگذاری پرونده ناموفق بود.
 sync.storage.error.directoryNotFound=پوشه پیدا نشد
 sync.storage.error.doesNotExist=%S وجود ندارد.
 sync.storage.error.createNow=آیا می‌خواهید آن را ایجاد کنید؟
-sync.storage.error.webdav.enterURL=لطفا یک WebDAV URL وارد کنید.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S یک WebDAV URL معتبر نیست.
 sync.storage.error.webdav.invalidLogin=کارگزار WebDAV نام کاربر و گذرواژه‌ای که وارد کردید را نپذیرفت.
 sync.storage.error.webdav.permissionDenied=شما مجوز دسترسی به %S روی کارگزار WebDAV را ندارید.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=خطای اتصال SSL در زما
 sync.storage.error.webdav.loadURLForMoreInfo=برای اطلاعات بیشتر WebDAV URL خود را در مرورگر وارد کنید.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=سهمیه «ذخیره پرونده‌های زوترو»ی شما پر شده است. برخی پرونده‌ها، بارگذاری نشدند. همزمان‌سازی سایر داده‌های زوترو با کارگزار همچنان انجام خواهد شد.
 sync.storage.error.zfs.personalQuotaReached2=تنظیمات حساب کاربری خود در zotero.org  را برای گزینه‌های ذخیره بیشتر ببینید.
 sync.storage.error.zfs.groupQuotaReached1=سهمیه «ذخیره پرونده‌های زوترو» گروه '%S' پر شده است. برخی پرونده‌ها باگذاری نشدند. همزمان‌سازی سایر داده‌های زوترو با کارگزار، همچنان انجام خواهد شد.
 sync.storage.error.zfs.groupQuotaReached2=مالک گروه می‌تواند ظرفیت ذخیره گروه را در قسمت تنظیمات ذخیره در وب‌گاه zotero.org افزایش دهد.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=ذخیره برچسب
 sync.longTagFixer.saveTags=ذخیره برچسب‌ها
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=خواندن متن از PDF امکان‌پذیر ن
 recognizePDF.noMatches=مرجع مطابقت کننده‌ای پیدا نشده
 recognizePDF.fileNotFound=پرونده پیدا نشد.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=بازیابی فراداده‌‌ها تمام شد.
 recognizePDF.close.label=بستن
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=مکانی را برای ذخیره پرونده قالب‌بندی شده انتخاب کنید
 rtfScan.scannedFileSuffix=(پیمایش شد)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=جستجوی ناموفق
 lookup.failure.description=زوترو نتوانست رکوردی برای شناسه مورد نظر پیدا کند. لطفا شناسه را بازبینی کنید و دوباره تلاش کنید.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=نمایش نسخه برخط
 locate.online.tooltip=رفتن به نسخه برخط این آیتم
diff --git a/chrome/locale/fi-FI/zotero/about.dtd b/chrome/locale/fi-FI/zotero/about.dtd
index 57b67e92c7..743bd15a5e 100644
--- a/chrome/locale/fi-FI/zotero/about.dtd
+++ b/chrome/locale/fi-FI/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Erityiskiitokset:">
 <!ENTITY zotero.about.close "Sulje">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Lisää kiitoksia">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/fi-FI/zotero/preferences.dtd b/chrome/locale/fi-FI/zotero/preferences.dtd
index e4a2e87f15..93dd67f470 100644
--- a/chrome/locale/fi-FI/zotero/preferences.dtd
+++ b/chrome/locale/fi-FI/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Oletus:">
 <!ENTITY zotero.preferences.items "nimikkeet">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Yleistä">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "Osoite:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Synkronoi liitetiedostot Omaan Kirjastoon käyttäen protokollaa">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Synkronoi ryhmäkirjastojen liitetiedostot käyttäen Zoteron tallennustilaa">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Käyttämällä Zoteron tallennustilaa sitoudut samalla siihen liittyviin">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "käyttöehtoihin">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Täydellinen synkronointi Zotero-palvelimen kanssa">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Yhdistä paikallinen Zotero-aineisto synkronointipalvelimen aineiston kanssa jättäen synkronointihistoria huomioimatta">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Palauta aineisto Zotero-palvelimelta">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Poista kaikki palvelimella oleva aineisto ja korvaa se paikallisella Zotero-aineistolla">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Poista tiedostojen synkronointihistoria">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Tarkistaa jokaisen paikallisen liitetiedoston löytymisen tallennuspalvelimelta">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Palauta">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Nimi">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Päivitetty">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Hanki lisää tyylejä...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Mikä tahansa merkkijono">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Lisäasetukset">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Paikanna">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Artikkelihakumoottorin hallinta">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Valitse...">
 <!ENTITY zotero.preferences.dataDir.reveal "Näytä datahakemisto">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Tietokannan huolto">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Tarkista tietokannan eheys">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Palauta sivustotulkkien ja tyylien oletusarvot...">
diff --git a/chrome/locale/fi-FI/zotero/standalone.dtd b/chrome/locale/fi-FI/zotero/standalone.dtd
index 7468743ef7..da6dfe2551 100644
--- a/chrome/locale/fi-FI/zotero/standalone.dtd
+++ b/chrome/locale/fi-FI/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Sulje">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
diff --git a/chrome/locale/fi-FI/zotero/zotero.dtd b/chrome/locale/fi-FI/zotero/zotero.dtd
index f2f3f6ac28..5bbd56f770 100644
--- a/chrome/locale/fi-FI/zotero/zotero.dtd
+++ b/chrome/locale/fi-FI/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Muokkaa">
 <!ENTITY zotero.general.delete "Poista">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Virhepäiväkirjassa saattaa olla mukana Zoteroon liittymättömiä viestejä.">
 <!ENTITY zotero.errorReport.submissionInProgress "Odota">
 <!ENTITY zotero.errorReport.submitted "Virheraporttisi on toimitettu.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Lähetä Zoteron keskustelualueelle (forums.zotero.org) viesti, joka sisältää raportin tunnuksen, ongelman kuvauksen sekä toimenpiteet, joilla virhe saadaan toistettua.">
 <!ENTITY zotero.errorReport.notReviewed "Error reports are generally not reviewed unless referred to in the forums.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Olet asentanut Zoteron uuden version.">
 <!ENTITY zotero.upgrade.upgradeRequired "Zotero-tietokantasi täytyy päivittää, jotta se toimisi uuden version kanssa.">
 <!ENTITY zotero.upgrade.autoBackup "Tietokantasi varmuuskopioidaan automaattisesti ennen muutosten tekemistä.">
@@ -56,7 +58,22 @@
 <!ENTITY zotero.items.rights_column "Oikeudet">
 <!ENTITY zotero.items.dateAdded_column "Lisätty">
 <!ENTITY zotero.items.dateModified_column "Muokattu">
-<!ENTITY zotero.items.numChildren_column "+">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Näytä kirjastossa">
 <!ENTITY zotero.items.menu.attach.note "Lisää muistiinpano">
@@ -104,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Muunna teksti">
 <!ENTITY zotero.item.textTransform.titlecase "Otsikon aakkoslaji">
 <!ENTITY zotero.item.textTransform.sentencecase "Lauseenkaltainen">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Uusi muistiinpano">
 <!ENTITY zotero.toolbar.note.standalone "Uusi itsenäinen muistiinpano">
@@ -121,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Select visible">
 <!ENTITY zotero.tagSelector.clearVisible "Deselect visible">
 <!ENTITY zotero.tagSelector.clearAll "Deselect all">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Rename Tag...">
 <!ENTITY zotero.tagSelector.deleteTag "Delete Tag...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Kirjoita ISBN-, DOI tai PMID-koodi allaolevaan laatikkoon.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Valitse nimikkeet">
 <!ENTITY zotero.selectitems.intro.label "Valitse nimikkeet, jotka haluat lisätä kirjastoon">
@@ -209,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Rastittamattomia merkkejä ei tallenneta.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Merkki poistetaan kaikista nimikkeistä.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Välityspalvelin tunnistettu">
 <!ENTITY zotero.proxy.recognized.warning "Lisää vain välityspalvelimia, jotka on linkitetty kirjastostasi, koulustasi tai yrityksestäsi">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Muiden välityspalvelinten lisääminen antaa haittasivustoille mahdollisuuden naamioitua luotettaviksi sivustoiksi.">
diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties
index 02f4d97faf..19b0f4e85f 100644
--- a/chrome/locale/fi-FI/zotero/zotero.properties
+++ b/chrome/locale/fi-FI/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Käynnistä uudelleen myöhemmin
 general.restartApp=Restart %S
 general.errorHasOccurred=On tapahtunut virhe
 general.unknownErrorOccurred=Tapahtui tuntematon virhe.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Käynnistä Firefox uudelleen.
 general.restartFirefoxAndTryAgain=Käynnistä Firefox uudelleen ja kokeile uudestaan
 general.checkForUpdate=Tarkista päivitykset
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Katso %S, jos haluat tietää lisää.
 general.enable=Laita päälle
 general.disable=Ota pois päältä
 general.remove=Poista
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Avaa käyttöohje
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Zoteron toimenpide on käynnissä.
 general.operationInProgress.waitUntilFinished=Odota, kunnes se valmis.
@@ -57,7 +64,7 @@ upgrade.advanceMessage=Paina %S päivittääksesi nyt.
 upgrade.dbUpdateRequired=Zoteron tietokanta on päivitettävä.
 upgrade.integrityCheckFailed=Zotero-tietokantasi on korjattava ennen päivityksen jatkamista.
 upgrade.loadDBRepairTool=Lataa tietokannan korjaustyökalu
-upgrade.couldNotMigrate=Zotero could not migrate all necessary files.\nPlease close any open attachment files and restart %S to try the upgrade again.
+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=Jos saat toistuvasti tämän viestin, käynnistä tietokone uudelleen.
 
 errorReport.reportError=Report Error...
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Paina %S lähettääksesi virheraportin Zoteron kehit
 errorReport.stepsToReproduce=Virheen saa aikaan tekemällä näin:
 errorReport.expectedResult=Odottamani lopputulos:
 errorReport.actualResult=Todellinen lopputulos:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Zoteron datakansiota ei löytynyt.
 dataDir.previousDir=Edellinen kansio:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Käytä Firefoxin profiilikansiota
 dataDir.selectDir=Valitse kansio Zoteron datalle
 dataDir.selectedDirNonEmpty.title=Kansio ei ole tyhjä
 dataDir.selectedDirNonEmpty.text=Valitsemasi kansio ei ole tyhjä eikä ilmeisesti Zoteron datakansio.\n\nLuodaanko Zoteron tiedot tähän kansioon siitä huolimatta?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Aiempi Zotero-kirjasto löytyi
 dataDir.standaloneMigration.description=Tämä vaikuttaa olevan ensimmäinen %1$S-kertasi. Haluatko, että %1$S tuo asetukset %2$S:sta ja käyttää aiempaa datahakemistoa?
 dataDir.standaloneMigration.multipleProfiles=%1$S jakaa datahakemiston viimeisimmän käytetyn profiilin kanssa.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Uusi tallennettu haku
 pane.collections.savedSearchName=Anna tälle tallennetulle haulle nimi:
 pane.collections.rename=Anna kokoelmalle uusi nimi:
 pane.collections.library=Oma Kirjasto
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Roskakori
 pane.collections.untitled=Nimetön
 pane.collections.unfiled=Lajittelemattomat nimikkeet
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Haluatko varmasti poistaa tämän merkin?\n\nMer
 pane.tagSelector.numSelected.none=0 merkkiä valittuna
 pane.tagSelector.numSelected.singular=%S merkki valittuna
 pane.tagSelector.numSelected.plural=%S merkkiä valittuna
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Ladataan kohdeluettelo...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Siirrä roskakoriin
 pane.items.trash=Haluatko varmasti siirtää valitun nimikkeen roskakoriin?
 pane.items.trash.multiple=Haluatko varmasti siirtää valitut nimikkeet roskakoriin?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S kohdetta valittuna
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Vaihda kohteen tyyppi
 pane.item.changeType.text=Haluatko varmasti vaihtaa kohteen tyypin?\n\nSeuraavat kentät menetetään:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S liitettä:
 pane.item.attachments.count.singular=%S liite:
 pane.item.attachments.count.plural=%S liitettä:
 pane.item.attachments.select=Valitse tiedosto
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=napsauta tästä
-pane.item.tags=Merkit:
 pane.item.tags.count.zero=%S merkkiä:
 pane.item.tags.count.singular=%S merkki:
 pane.item.tags.count.plural=%S merkkiä:
 pane.item.tags.icon.user=Käyttäjän lisäämä merkki
 pane.item.tags.icon.automatic=Automaattisesti lisätty merkki
-pane.item.related=Liittyvä:
 pane.item.related.count.zero=%S liittyvää:
 pane.item.related.count.singular=%S liittyvä:
 pane.item.related.count.plural=%S liittyvää:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Et voi lisätä tiedostoja valittuun kokoe
 ingester.saveToZotero=Tallenna Zoteroon
 ingester.saveToZoteroUsing=Tallentaan Zoteroon käyttäen "%S"
 ingester.scraping=Saving Item...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Nimike tallennettu
 ingester.scrapeError=Nimikettä ei voitu tallentaa
 ingester.scrapeErrorDescription=Nimikkeen tallentamisessa tapahtui virhe. Katso %S, jos haluat tietää lisää.
@@ -428,12 +469,13 @@ ingester.importReferRISDialog.checkMsg=Salli aina tälle sivustolle
 
 ingester.importFile.title=Tuo tiedosto
 ingester.importFile.text=Haluatko tuoda tiedoston "%S"?\n\nNimikkeet lisätään uuteen kokoelmaan.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Haku suoritetaan...
 ingester.lookup.error=Hakua suoritettaessa tapahtui virhe.
 
 db.dbCorrupted=Zotero-tietokanta '%S' vaikuttaa olevan vioittunut.
-db.dbCorrupted.restart=Please restart %S to attempt an automatic restore from the last backup.
+db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
 db.dbCorruptedNoBackup=Zotero-tietokanta '%S' vaikuttaa olevan vioittunut, eikä automaattista varmuuskopioita ole saatavilla.\n\nUusi tietokantatiedosto on nyt luotu. Vioittunut tiedosto on tallennettu Zotero-hakemistoosi.
 db.dbRestored=Zotero-tietokanta '%1S' vaikuttaa olevan vioittunut.\n\nTiedot palautettiin automaattisesta varmuuskopiosta, joka on tehty %2$S %3$S. Vioittunut tiedosto on tallennettu Zotero-hakemistoosi.
 db.dbRestoreFailed=Zotero-tietokanta '%S' vaikuttaa olevan vioittunut, ja yritys palauttaa automaattinen varmuuskopio epäonnistui.\n\nUusi tietokantatiedosto on nyt luotu. Vioittunut tiedosto on tallennettu Zotero-hakemistoosi.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S linkkipalvelinta löytyi
 zotero.preferences.openurl.resolversFound.singular=%S linkkipalvelin löytyi
 zotero.preferences.openurl.resolversFound.plural=%S linkkipalvelinta löytyi
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Luo indeksi uudelleen
 zotero.preferences.search.rebuildWarning=Haluatko luoda koko indeksin uudelleen? Tämä saattaa kestää hetken.\n\nIndeksoidaksesi vain aiemmin indeksoimattomat nimikkeet käytä toimintoa %S.
 zotero.preferences.search.clearIndex=Tyhjennä indeksi
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Kaikki uudet tai muokat
 zotero.preferences.advanced.resetStyles=Resetoi tyylit
 zotero.preferences.advanced.resetStyles.changesLost=Kaikki uudet tai muokatut tyylit menetetään
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Seuraavat tiedostot olivat jo valmiiksi kohdehakemistossa, ja niitä ei kopioitu:
 dragAndDrop.filesNotFound=Seuraavia tiedostoja ei löytynyt eikä niitä voinut kopioida:
 
@@ -500,7 +559,8 @@ fileInterface.import=Tuonti
 fileInterface.export=Vienti
 fileInterface.exportedItems=Viedyt nimikkeet
 fileInterface.imported=Tuodut
-fileInterface.fileFormatUnsupported=Annetulle tiedostolle ei löytynyt tulkkia.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Nimetön lähdeluettelo
 fileInterface.bibliographyHTMLTitle=Lähdeluettelo
 fileInterface.importError=Tapahtui virhe yrittäessä tuoda valittua tiedostoa. Varmista, että tiedosto on kunnossa, ja yritä uudelleen.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Valitsemissasi nimikkeissä ei ole viitteitä. V
 fileInterface.bibliographyGenerationError=Lähdeluetteloa luotaessa tapahtui virhe. Yritä uudelleen.
 fileInterface.exportError=Valittua tiedostoa vietäessä tapahtui virhe.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Tarkennettu haku — paina Enter etsiäksesi.
 searchInProgress=Haku käynnissä — odota hetki.
 
@@ -613,11 +677,12 @@ integration.cited.loading=Ladataan siteerattuja nimikkeitä...
 integration.ibid=mt
 integration.emptyCitationWarning.title=tyhjä sitaatti
 integration.emptyCitationWarning.body=Määrittelemäsi sitaatti olisi tyhjä valitussa tyylissä. Haluatko varmasti lisätä sen?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S edellytyksenä on %2$S %3$S tai uudempi. Lataa %2$S:n uusin versio osoitteesta zotero.org.
 integration.error.title=Zoteron integraatiovirhe
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Virhe asiakirjaa päivitettäessä
 integration.error.mustInsertCitation=Sinun täytyy lisätä sitaatti ennen tämän toiminnon suorittamista
 integration.error.mustInsertBibliography=Sinun täytyy lisätä lähdeluettelo ennen tämän toiminnon suorittamista
@@ -643,14 +708,22 @@ integration.citationChanged=Olet muokannut sitaatti sen jälkeen kuin Zotero gen
 integration.citationChanged.description=Jos painat "Kyllä", Zotero ei voi päivittää tätä sitaattia, vaikka lisäisi uusia sitaatteja, vaihtaisit tyylejä tai muokkaisit nimikettä, johon sitaatti viittaa. Jos painat "Ei", muutoksesi poistetaan.
 integration.citationChanged.edit=Olet muokannut tätä sitaattia sen jälkeen kun Zotero generoi sen. Muokkaaminen poistaa muutokset. Haluatko jatkaa?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Asennetaanko tyyli "%1$S" lähteestä %2$S?
 styles.updateStyle=Päivitetäänkö aiempi tyyli "%1$S" tyylillä "%2$S" lähteestä %3$S?
 styles.installed=Tyyli "%S" asennettiin onnistuneesti.
 styles.installError=%S ei vaikuta olevan kelvollinen tyylitiedosto.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S viittaa epäkelpoon tai olemattoon CSL-tiedostoon %2$S.
 styles.deleteStyle=Haluatko varmasti poistaa tyylin "%1$S"?
 styles.deleteStyles=Haluatko varmasti poistaa valitut tyylit?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Peruuta synkronointi
 sync.openSyncPreferences=Open Sync Preferences...
 sync.resetGroupAndSync=Resetoi ryhmä ja synkronointi
@@ -660,18 +733,55 @@ sync.remoteObject=Etäobjekti
 sync.mergedObject=Yhdistetty objekti
 
 sync.error.usernameNotSet=Käyttäjänimeä ei määritetty
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Salasanaa ei määritetty
 sync.error.invalidLogin=Virheellinen käyttäjänimi tai salasana
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Anna salasana.
 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=Synkronointi on jo käynnissä.
-sync.error.syncInProgress.wait=Wait for the previous sync to complete or restart %S.
+sync.error.syncInProgress.wait=Wait for the previous sync to complete or restart Firefox.
 sync.error.writeAccessLost=Sinulla ei enää ole kirjoitusoikeutta Zoteron ryhmään '%S'. Lisäämiäsi tai muokkaamiasi tiedostoja ei voida synkronoida palvelimelle.
 sync.error.groupWillBeReset=Jos jatkat, kopiosi ryhmästä resetoituu siihen tilaan, missä se palvelimella on. Paikalliset muokkaukset nimikkeisiin ja tiedostoihin menetetään.
 sync.error.copyChangedItems=Jos haluat mahdollisuuden kopioida tekemäsi muutokset muualle tai pyytää kirjoitusoikeutta ryhmän ylläpitäjältä, peruuta synkronointi nyt.
 sync.error.manualInterventionRequired=Automaattinen synkronointi johti konfliktiin, joka vaatii manuaalista väliintuloa.
 sync.error.clickSyncIcon=Paina synkronointikuvaketta aloittaaksesi synkronoinnin manuaalisesti.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Ei vielä synkronoitu
 sync.status.lastSync=Viimeisin synkronointi:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Siirretään tietoja synkronointipalvelimelle
 sync.status.uploadAccepted=Tiedonsiirto hyväksytty \u2014 odotetaan synkronointipalvelinta
 sync.status.syncingFiles=Synkronoidaan tiedostoja
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%S kt jäljellä
 sync.storage.filesRemaining=%1$S/%2$S tiedostoa
 sync.storage.none=Ei mitään
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Paikallinen tiedosto
 sync.storage.remoteFile=Etätiedosto
 sync.storage.savedFile=Tallennettu tiedosto
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Palvelinasetukset varmistettu
 sync.storage.fileSyncSetUp=Tiedostosynkronisaatio on nyt määritetty.
 sync.storage.openAccountSettings=Avaa tilin asetukset
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Palvelinta %S ei voitu tavoittaa.
 sync.storage.error.permissionDeniedAtAddress=Sinulle ei ole oikeutta luoda Zotero-kansiota osoitteeseen:
 sync.storage.error.checkFileSyncSettings=Tarkista tiedostojen synkronoinnin asetukset tai ota yhteyttä palvelimesi ylläpitäjään.
 sync.storage.error.verificationFailed=%S tarkistus epäonnistui. Tarkista tiedostojen synkronointiasetukset Zoteron asetusten Synkronisaatio-välilehdeltä.
 sync.storage.error.fileNotCreated=Tiedostoa '%S' ei voitu luoda Zoteron 'storage'-kansioon.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Sinulle ei enää ole muokkausoikeutta Zoteron ryhmään '%S', joten lisäämiäsi tai muokkaamiasi tiedostoja ei voida synkronoida palvelimelle.
 sync.storage.error.copyChangedItems=Jos haluat säilyttää mahdollisuuden kopioida muutetut nimikkeet ja tiedostot muualle, peruuta synkronointi nyt.
 sync.storage.error.fileUploadFailed=Tiedostojen siirto palvelimelle epäonnistui.
 sync.storage.error.directoryNotFound=Kansiota ei löytynyt
 sync.storage.error.doesNotExist=Sijaintia %S ei ole olemassa.
 sync.storage.error.createNow=Haluatko luoda sen nyt?
-sync.storage.error.webdav.enterURL=Anna WebDAV-osoite.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S ei ole kelvollinen WebDAV-osoite.
 sync.storage.error.webdav.invalidLogin=WebDAV-palvelin ei hyväksynyt antamaasi käyttäjätunnusta ja salasanaa.
 sync.storage.error.webdav.permissionDenied=Sinulla ei ole käyttöoikeutta WebDAV-palvelimen sijaintiin %S.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL-yhteysvirhe yhdistettäessä ko
 sync.storage.error.webdav.loadURLForMoreInfo=Lataa WebDAV-osoite nettiselaimessa saadaksesi lisätietoja
 sync.storage.error.webdav.seeCertOverrideDocumentation=Katso lisätietoja sertifikaatin ohittamisen ohjeista.
 sync.storage.error.webdav.loadURL=Lataa WebDAV-osoite
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Kiintiö palvelimelle tallennettaville tiedostoille on tullut täyteen. Osa tiedoista jäi siirtämättä. Muu Zotero-aineisto synkronoituu edelleen palvelimelle.
 sync.storage.error.zfs.personalQuotaReached2=Tutustu tallennustilan lisäpalveluihin osoitteessa zotero.org.
 sync.storage.error.zfs.groupQuotaReached1=Ryhmän '%S' kiintiö palvelimelle tallennettaville tiedostoille on tullut täyteen. Osa tiedoista jäi siirtämättä. Muu Zotero-aineisto synkronoituu edelleen palvelimelle.
 sync.storage.error.zfs.groupQuotaReached2=Ryhmän omistaja voi lisätä ryhmän tallennustilaa osoitteessa zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Tallenna merkki
 sync.longTagFixer.saveTags=Tallenna merkit
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=PDF-tiedoston tekstiä ei voi lukea.
 recognizePDF.noMatches=Nimikkeitä ei löytynyt.
 recognizePDF.fileNotFound=Tiedostoa ei löydy
 recognizePDF.limit=Kyselyjen raja ylitetty. Yritä myöhemmin uudelleen.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metatiedon haku on valmis.
 recognizePDF.close.label=Sulje
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Valitse muotoillun tiedoston tallennuksen kohde
 rtfScan.scannedFileSuffix=(Skannattu)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Haku epäonnistui
 lookup.failure.description=Zotero ei löytänyt annettua tunnistetta rekistereistä. Tarkista tunniste ja yritä uudelleen.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Katso verkossa
 locate.online.tooltip=Hae tämä nimike verkosta
diff --git a/chrome/locale/fr-FR/zotero/about.dtd b/chrome/locale/fr-FR/zotero/about.dtd
index 8736937c88..c04ad4c9ee 100644
--- a/chrome/locale/fr-FR/zotero/about.dtd
+++ b/chrome/locale/fr-FR/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Remerciements particuliers :">
 <!ENTITY zotero.about.close "Fermer">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Crédits supplémentaires &amp; remerciements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/fr-FR/zotero/preferences.dtd b/chrome/locale/fr-FR/zotero/preferences.dtd
index 794ceaedaf..95105a5371 100644
--- a/chrome/locale/fr-FR/zotero/preferences.dtd
+++ b/chrome/locale/fr-FR/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Par défaut :">
 <!ENTITY zotero.preferences.items "documents">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Générales">
 
@@ -28,8 +29,8 @@
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader.tooltip "Si activé, le numéro de version de Zotero sera ajouté aux requêtes HTTP vers zotero.org.">
 <!ENTITY zotero.preferences.parseRISRefer "Utiliser Zotero pour les fichiers RIS/Refer téléchargés">
 <!ENTITY zotero.preferences.automaticSnapshots "Faire une capture automatique de la page lors de la création de documents à partir de pages Web">
-<!ENTITY zotero.preferences.downloadAssociatedFiles "Joindre automatiquement les fichers PDF associés lors de l'enregistrement d'un document">
-<!ENTITY zotero.preferences.automaticTags "Ajouter automatiquement aux documents des marqueurs grâce aux mots-clés et aux sujets">
+<!ENTITY zotero.preferences.downloadAssociatedFiles "Joindre automatiquement les fichiers PDF associés lors de l'enregistrement d'un document">
+<!ENTITY zotero.preferences.automaticTags "Ajouter automatiquement aux documents des marqueurs grâce aux mots-clés et aux rubriques">
 <!ENTITY zotero.preferences.trashAutoEmptyDaysPre "Supprimer automatiquement les documents mis à la corbeille depuis plus de">
 <!ENTITY zotero.preferences.trashAutoEmptyDaysPost "jours">
 
@@ -56,20 +57,26 @@
 <!ENTITY zotero.preferences.sync.syncAutomatically "Synchroniser automatiquement">
 <!ENTITY zotero.preferences.sync.about "À propos de la synchronisation">
 <!ENTITY zotero.preferences.sync.fileSyncing "Synchronisation des fichiers">
-<!ENTITY zotero.preferences.sync.fileSyncing.url "Adresse :">
+<!ENTITY zotero.preferences.sync.fileSyncing.url "Adresse (URL) :">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Synchroniser les fichiers joints de Ma bibliothèque en utilisant">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Synchroniser les fichiers joints dans les bibliothèques de groupe en utilisant le stockage de Zotero">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "À propos de la synchronisation des fichiers">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "En utilisant le stockage de Zotero, vous acceptez d'être lié par ses">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "modalités et conditions">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Synchronisation complète avec le serveur Zotero">
-<!ENTITY zotero.preferences.sync.reset.fullSync.desc "Fusionner les données de Zotero locales avec les données du serveur de synchronisation, ignorant ainsi l'historique de synchronisation.">
+<!ENTITY zotero.preferences.sync.reset.fullSync.desc "Fusionner les données locales de Zotero avec les données du serveur de synchronisation, ignorant ainsi l'historique de synchronisation.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Restaurer à partir du serveur Zotero">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer.desc "Effacer toutes les données locales de Zotero et restaurer à partir du serveur de synchronisation.">
-<!ENTITY zotero.preferences.sync.reset.restoreToServer "Restaurer le serveur Zotero">
+<!ENTITY zotero.preferences.sync.reset.restoreToServer "Restaurer vers le serveur Zotero">
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Effacer toutes les données du serveur et les écraser avec les données locales de Zotero.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Réinitialiser l'historique de synchronisation des fichiers">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Forcer la recherche de tous les fichiers joints dans le serveur de stockage.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Réinitialiser">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titre">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Mis à jour">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Obtenir des styles supplémentaires…">
 
 <!ENTITY zotero.preferences.prefpane.keys "Raccourcis clavier">
@@ -137,7 +145,7 @@
 <!ENTITY zotero.preferences.proxies.desc_before_link "Zotero redirigera les requêtes de manière transparente à travers les serveurs mandataires enregistrés. Consultez la">
 <!ENTITY zotero.preferences.proxies.desc_link "documentation concernant les serveurs mandataires">
 <!ENTITY zotero.preferences.proxies.desc_after_link "pour plus d'information.">
-<!ENTITY zotero.preferences.proxies.transparent "Activer la redirection par un serveur mandataire">
+<!ENTITY zotero.preferences.proxies.transparent "Activer la redirection par un serveur mandataire (proxy)">
 <!ENTITY zotero.preferences.proxies.autoRecognize "Reconnaître automatiquement les ressources passant par un serveur mandataire">
 <!ENTITY zotero.preferences.proxies.disableByDomain "Désactiver la redirection par un serveur mandataire lorsque mon nom de domaine contient ">
 <!ENTITY zotero.preferences.proxies.configured "Serveurs mandataires configurés">
@@ -145,7 +153,7 @@
 <!ENTITY zotero.preferences.proxies.scheme "Schéma">
 
 <!ENTITY zotero.preferences.proxies.multiSite "Multi-site">
-<!ENTITY zotero.preferences.proxies.autoAssociate "Associer automatiquement les nouveaux hôtes">
+<!ENTITY zotero.preferences.proxies.autoAssociate "Associer automatiquement les nouvelles adresses">
 <!ENTITY zotero.preferences.proxies.variables "Vous pouvez utiliser les variables suivantes dans votre schéma de mandataire :">
 <!ENTITY zotero.preferences.proxies.h_variable "&#37;h - L'adresse du site atteint via un serveur mandataire (ex. www.zotero.org)">
 <!ENTITY zotero.preferences.proxies.p_variable "&#37;p - Le chemin vers la page transmise via un serveur mandataire en excluant la barre oblique initiale (ex. about/index.html)">
@@ -154,12 +162,13 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - N'importe quelle chaîne de caractère">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avancées">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Localiser">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Gestion des moteurs de recherche d'articles">
 <!ENTITY zotero.preferences.locate.description "Description">
 <!ENTITY zotero.preferences.locate.name "Nom">
-<!ENTITY zotero.preferences.locate.locateEnginedescription "Un moteur de recherche étend les capacités du menu Localiser du panneau d'information. En activant des moteurs de recherche dans la liste ci-dessous, ils seront ajoutés au menu déroulant et pourront être utilisés pour localiser des ressources de votre bibliothèque sur le Web.">
+<!ENTITY zotero.preferences.locate.locateEnginedescription "Un moteur de recherche étend les capacités du menu Localiser du panneau Info. En activant des moteurs de recherche dans la liste ci-dessous, ils seront ajoutés au menu déroulant et pourront être utilisés pour localiser des ressources de votre bibliothèque sur le Web.">
 <!ENTITY zotero.preferences.locate.addDescription "Pour ajouter un moteur de recherche absent de la liste, allez sur le moteur de recherche voulu dans votre navigateur et sélectionnez &#34;Ajoutez&#34; dans le menu &#34;Localiser&#34; de Zotero.">
 <!ENTITY zotero.preferences.locate.restoreDefaults "Rétablir les moteurs par défaut">
 
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Sélectionner…">
 <!ENTITY zotero.preferences.dataDir.reveal "Afficher le répertoire contenant les données">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Maintenance de la base de données">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Vérifier l'intégrité de la base de données">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Réinitialiser les convertisseurs et les styles…">
diff --git a/chrome/locale/fr-FR/zotero/searchbox.dtd b/chrome/locale/fr-FR/zotero/searchbox.dtd
index c835ad442a..82dfe4da50 100644
--- a/chrome/locale/fr-FR/zotero/searchbox.dtd
+++ b/chrome/locale/fr-FR/zotero/searchbox.dtd
@@ -5,7 +5,7 @@
 <!ENTITY zotero.search.joinMode.all "à toutes les">
 <!ENTITY zotero.search.joinMode.suffix "condition(s) suivante(s) :">
 
-<!ENTITY zotero.search.recursive.label "Rechercher dans les sous-dossiers">
+<!ENTITY zotero.search.recursive.label "Rechercher dans les sous-collections">
 <!ENTITY zotero.search.noChildren "Ne montrer que les objets de niveau supérieur">
 <!ENTITY zotero.search.includeParentsAndChildren "Inclure les objets parents et enfants correspondants">
 
diff --git a/chrome/locale/fr-FR/zotero/zotero.dtd b/chrome/locale/fr-FR/zotero/zotero.dtd
index ced37ca095..c55112f67f 100644
--- a/chrome/locale/fr-FR/zotero/zotero.dtd
+++ b/chrome/locale/fr-FR/zotero/zotero.dtd
@@ -5,13 +5,15 @@
 <!ENTITY zotero.general.edit "Modifier">
 <!ENTITY zotero.general.delete "Supprimer">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Le journal des erreurs peut comprendre des messages sans rapport avec Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Veuillez patienter pendant la transmission du rapport d'erreur.">
 <!ENTITY zotero.errorReport.submitted "Le rapport d'erreur a été transmis.">
 <!ENTITY zotero.errorReport.reportID "ID du rapport :">
 <!ENTITY zotero.errorReport.postToForums "Veuillez poster un message sur les forums Zotero (forums.zotero.org) avec cet ID du rapport, une description du problème et les étapes nécessaires pour le reproduire.">
-<!ENTITY zotero.errorReport.notReviewed "Les rapports d'erreurs ne sont généralement pas étudiés sauf sauf s'ils sont référencés dans les forums.">
+<!ENTITY zotero.errorReport.notReviewed "Les rapports d'erreurs ne sont pas étudiés s'ils ne sont pas référencés sur les forums Zotero.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Vous avez installé une nouvelle version de Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Votre base de données Zotero doit être mise à jour pour fonctionner avec cette nouvelle version.">
 <!ENTITY zotero.upgrade.autoBackup "Votre base de données actuelle va être sauvegardée automatiquement avant toute modification.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Autorisations">
 <!ENTITY zotero.items.dateAdded_column "Date d'ajout">
 <!ENTITY zotero.items.dateModified_column "Date de modification">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Afficher dans la bibliothèque">
 <!ENTITY zotero.items.menu.attach.note "Ajouter une note">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transformer le texte">
 <!ENTITY zotero.item.textTransform.titlecase "Initiales En Majuscules">
 <!ENTITY zotero.item.textTransform.sentencecase "Lettre capitale en début de phrase">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nouvelle note">
 <!ENTITY zotero.toolbar.note.standalone "Nouvelle note indépendante">
@@ -120,17 +139,25 @@
 <!ENTITY zotero.tagSelector.selectVisible "Sélectionner ce qui est visible">
 <!ENTITY zotero.tagSelector.clearVisible "Désélectionner ce qui est visible">
 <!ENTITY zotero.tagSelector.clearAll "Tout désélectionner">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Renommer le marqueur…">
 <!ENTITY zotero.tagSelector.deleteTag "Effacer le marqueur…">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Saisir l'ISBN, le DOI ou le PMID à chercher dans la boîte ci-dessous.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Sélectionner des documents">
 <!ENTITY zotero.selectitems.intro.label "Veuillez sélectionner les documents à ajouter à votre bibliothèque">
 <!ENTITY zotero.selectitems.cancel.label "Annuler">
 <!ENTITY zotero.selectitems.select.label "OK">
 
-<!ENTITY zotero.bibliography.title "Créer une bibliographie">
+<!ENTITY zotero.bibliography.title "Créer une citation/bibliographie">
 <!ENTITY zotero.bibliography.style.label "Style de citation :">
 <!ENTITY zotero.bibliography.outputMode "Mode de création :">
 <!ENTITY zotero.bibliography.bibliography "Bibliographie">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Les marqueurs non sélectionnés ne seront pas sauvegardés.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Le marqueur sera supprimé de tous les documents.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Serveur mandataire identifié">
 <!ENTITY zotero.proxy.recognized.warning "Ajouter uniquement des serveurs mandataires référencés par le site de votre bibliothèque, établissement scolaire ou société">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Ajouter d'autres serveurs mandataires permet à des sites malveillants de se faire passer pour des sites de confiance.">
diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties
index f2e55de604..1e5dec8699 100644
--- a/chrome/locale/fr-FR/zotero/zotero.properties
+++ b/chrome/locale/fr-FR/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Redémarrer plus tard
 general.restartApp=Redémarrer %S
 general.errorHasOccurred=Une erreur est survenue.
 general.unknownErrorOccurred=Une erreur indéterminée est survenue.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Veuillez redémarrer %S.
 general.restartFirefoxAndTryAgain=Veuillez redémarrer %S et essayer à nouveau.
 general.checkForUpdate=Rechercher des mises à jour
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Consultez %S pour plus d'information.
 general.enable=Activer
 general.disable=Désactiver
 general.remove=Supprimer
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Consulter la documentation
 general.numMore=%S autres…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Une opération Zotero est actuellement en cours.
 general.operationInProgress.waitUntilFinished=Veuillez attendre jusqu'à ce qu'elle soit terminée.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Appuyez sur %S pour envoyer un rapport d'erreur aux d
 errorReport.stepsToReproduce=Étapes à reproduire :
 errorReport.expectedResult=Résultat attendu :
 errorReport.actualResult=Résultat obtenu :
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Le répertoire des données de Zotero n'a pu être trouvé.
 dataDir.previousDir=Répertoire précédent :
@@ -75,7 +98,11 @@ dataDir.useProfileDir=Utiliser le répertoire de profil de %S
 dataDir.selectDir=Sélectionner un répertoire de données Zotero
 dataDir.selectedDirNonEmpty.title=Répertoire non vide
 dataDir.selectedDirNonEmpty.text=Le répertoire que vous avez sélectionné n'est pas vide et ne semble pas être un répertoire de données Zotero.\n\nCréer néanmoins les fichiers Zotero dans ce répertoire ?
-dataDir.standaloneMigration.title=Notification de migration Zotero
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
+dataDir.standaloneMigration.title=Bibliothèque Zotero existante détectée
 dataDir.standaloneMigration.description=Il semble que cela soit votre première utilisation de %1$S. Souhaitez-vous que %1$S importe les paramètres de %2$S et utilise votre répertoire de données déjà existant ?
 dataDir.standaloneMigration.multipleProfiles=%1$S partagera son répertoire de données avec le dernier profil utilisé.
 dataDir.standaloneMigration.selectCustom=Répertoire de données personnalisé…
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Nouvelle recherche enregistrée
 pane.collections.savedSearchName=Entrez un nom pour cette recherche enregistrée :
 pane.collections.rename=Renommer la collection :
 pane.collections.library=Ma bibliothèque
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Corbeille
 pane.collections.untitled=Sans titre
 pane.collections.unfiled=Non classés
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Voulez-vous vraiment effacer ce marqueur ?\n\nIl
 pane.tagSelector.numSelected.none=Aucun marqueur sélectionné
 pane.tagSelector.numSelected.singular=%S marqueur sélectionné
 pane.tagSelector.numSelected.plural=%S marqueurs sélectionnés
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Chargement de la liste des objets…
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Mettre à la corbeille
 pane.items.trash=Voulez-vous vraiment mettre le document sélectionné à la corbeille?
 pane.items.trash.multiple=Voulez-vous vraiment mettre les documents sélectionnés à la corbeille?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S documents sélectionnés
 pane.item.unselected.zero=Aucun document dans cet affichage
 pane.item.unselected.singular=%S document dans cet affichage
 pane.item.unselected.plural=%S documents dans cet affichage
-pane.item.selectToMerge=Sélectionnez les documents à fusionner
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Changer le type du document
 pane.item.changeType.text=Voulez-vous vraiment changer le type du document ?\n\nLes champs suivants seront perdus :
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S pièce jointe :
 pane.item.attachments.count.singular=%S pièce jointe :
 pane.item.attachments.count.plural=%S pièces jointes :
 pane.item.attachments.select=Sélectionner un fichier
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=Cliquez ici
-pane.item.tags=Marqueurs :
 pane.item.tags.count.zero=%S marqueur :
 pane.item.tags.count.singular=%S marqueur :
 pane.item.tags.count.plural=%S marqueurs :
 pane.item.tags.icon.user=Marqueur ajouté par l'utilisateur
 pane.item.tags.icon.automatic=Marqueur ajouté automatiquement
-pane.item.related=Connexes :
 pane.item.related.count.zero=%S connexe :
 pane.item.related.count.singular=%S connexe :
 pane.item.related.count.plural=%S connexes :
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Vous ne pouvez pas ajouter des fichiers à
 ingester.saveToZotero=Enregistrer vers Zotero
 ingester.saveToZoteroUsing=Enregistrer vers Zotero en utilisant "%S"
 ingester.scraping=Enregistrement du document en cours…
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Document enregistré
 ingester.scrapeError=Échec de l'enregistrement
 ingester.scrapeErrorDescription=Une erreur s'est produite lors de l'enregistrement de ce document. Veuillez consulter %s pour davantage de précisions.
@@ -427,7 +468,8 @@ ingester.importReferRISDialog.text=Voulez-vous importer des documents de "%1$S"
 ingester.importReferRISDialog.checkMsg=Toujours autoriser pour ce site
 
 ingester.importFile.title=Importer un fichier
-ingester.importFile.text=Voulez-vous importer le fichier "%S" ?\n\ndocuments seront ajoutés à une nouvelle collection.
+ingester.importFile.text=Voulez-vous importer le fichier "%S" ?\n\n documents seront ajoutés à une nouvelle collection.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Recherche en cours...
 ingester.lookup.error=Une erreur s'est produite lors de la recherche pour ce document.
@@ -439,7 +481,7 @@ db.dbRestored=La base de données Zotero '%1$S' semble avoir été corrompue.\n\
 db.dbRestoreFailed=La base de données Zotero '%S'semble avoir été corrompue et une tentative de récupération à partir de la dernière sauvegarde automatique a échoué.\n\nUne nouvelle base de données a été créée. Le fichier endommagé a été enregistré dans votre dossier Zotero.
 
 db.integrityCheck.passed=Aucune erreur trouvée dans la base de données.
-db.integrityCheck.failed=Des erreurs ont été trouvées dans la base de données !
+db.integrityCheck.failed=Des erreurs ont été trouvées dans votre base de données Zotero.
 db.integrityCheck.dbRepairTool=Vous pouvez utiliser l'outil de réparation de base de données en ligne à http://zotero.org/utils/dbfix pour tenter de corriger ces erreurs.
 db.integrityCheck.repairAttempt=Zotero peut essayer de corriger ces erreurs.
 db.integrityCheck.appRestartNeeded=%S devra être redémarré.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Ouvrir les PDF et les autres fichiers da
 zotero.preferences.openurl.resolversFound.zero=%S résolveur de liens trouvé
 zotero.preferences.openurl.resolversFound.singular=%S résolveur de liens trouvé
 zotero.preferences.openurl.resolversFound.plural=%S résolveurs de liens trouvé
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Reconstruire l'index
 zotero.preferences.search.rebuildWarning=Voulez-vous reconstruire l'index entier ? Cela peut prendre un moment.\n\nPour n'indexer que les documents non indexés, utilisez %S.
 zotero.preferences.search.clearIndex=Effacer l'index
@@ -480,7 +535,7 @@ zotero.preferences.search.pdf.toolsDownloadError=Une erreur est survenue en essa
 zotero.preferences.search.pdf.tryAgainOrViewManualInstructions=Veuillez réessayer plus tard, ou consultez la documentation pour les instructions d'installation manuelle.
 zotero.preferences.export.quickCopy.bibStyles=Styles bibliographiques
 zotero.preferences.export.quickCopy.exportFormats=Formats d'exportation
-zotero.preferences.export.quickCopy.instructions=La copie rapide vous permet de copier les références sélectionnées vers le presse-papiers par un raccourci clavier (%S) ou en glissant les références dans une zone de texte d'une page Web.
+zotero.preferences.export.quickCopy.instructions=La copie rapide vous permet de copier les références sélectionnées vers le presse-papiers en appuyant sur les touches %S ou en glissant-déposant les références dans une zone de texte d'une page Web.
 zotero.preferences.export.quickCopy.citationInstructions=Pour les styles bibliographiques, vous pouvez en outre copier les références sous forme de citations / notes de bas de page avec le raccourci clavier %S ou en maintenant la touche Maj enfoncée pendant que vous glissez-déposez les références.
 zotero.preferences.styles.addStyle=Ajouter un style
 
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Tous les convertisseurs
 zotero.preferences.advanced.resetStyles=Réinitialiser les styles
 zotero.preferences.advanced.resetStyles.changesLost=Tous les styles nouveaux ou modifiés seront perdus.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Les fichiers suivants existent déjà dans le répertoire de destination et n'ont pas été copiés :
 dragAndDrop.filesNotFound=Les fichiers suivants n'ont pas été trouvés et n'ont pas pu être copiés :
 
@@ -500,7 +559,8 @@ fileInterface.import=Importer
 fileInterface.export=Exporter
 fileInterface.exportedItems=Documents exportés
 fileInterface.imported=Importé
-fileInterface.fileFormatUnsupported=Aucun collecteur de données n'a pu être trouvé pour le fichier indiqué.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Bibliographie sans nom
 fileInterface.bibliographyHTMLTitle=Bibliographie
 fileInterface.importError=Une erreur s'est produite lors de la tentative d'importation du fichier sélectionné. Veuillez vérifier que le fichier est valide et réessayez.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Les documents que vous avez sélectionnés ne co
 fileInterface.bibliographyGenerationError=Une erreur s'est produite lors de la création de votre bibliographie. Veuillez réessayer.
 fileInterface.exportError=Une erreur s'est produite lors de la tentative d'exportation du fichier sélectionné.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Mode recherche avancée — Touche Entrée pour lancer la recherche.
 searchInProgress=Recherche en cours — Veuillez patientez.
 
@@ -591,7 +655,7 @@ annotations.oneWindowWarning=Les annotations d'une capture d'écran ne peuvent 
 integration.fields.label=Champs
 integration.referenceMarks.label=Marques de référence
 integration.fields.caption=Les champs de Microsoft Word risquent moins d'être modifiés accidentellement mais ne peuvent pas être partagés avec OpenOffice/LibreOffice.
-integration.fields.fileFormatNotice=Le document doit être enregistré dans le format de fichier .doc ou .docx.
+integration.fields.fileFormatNotice=Le document doit être enregistré dans le format de fichier .doc
 integration.referenceMarks.caption=Les marques de référence d'OpenOffice/LibreOffice risquent moins d'être modifiés accidentellement mais ne peuvent pas être partagés avec Microsoft Word.
 integration.referenceMarks.fileFormatNotice=Le document doit être enregistré dans le format de fichier .odt.
 
@@ -613,6 +677,7 @@ integration.cited.loading=Chargement des références citées en cours…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Citation vierge
 integration.emptyCitationWarning.body=La citation indiquée serait vide dans le style actuellement sélectionné. Voulez-vous vraiment l'ajouter ?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Cette version du plugin Zotero pour traitement de texte ($INTEGRATION_VERSION) est incompatible avec la version actuellement installée de Zotero (%1$S). Veuillez vous assurer que vous utilisez les dernières versions des deux composants.
 integration.error.incompatibleVersion2=Zotero %1$S nécessite %2$S %3$S ou ultérieur. Veuillez télécharger la dernière version de %2$S sur zotero.org.
@@ -625,12 +690,12 @@ integration.error.cannotInsertHere=Des champs Zotero ne peuvent pas être insér
 integration.error.notInCitation=Vous devez disposer le curseur dans une citation Zotero pour la modifier.
 integration.error.noBibliography=Ce style bibliographique ne définit pas une bibliographie. Si vous souhaitez ajouter une bibliographie, veuillez sélectionner un autre style.
 integration.error.deletePipe=Le canal utilisé par Zotero pour communiquer avec le traitement de texte n'a pas pu être initialisé. Voulez-vous que Zotero essaie de corriger cette erreur ? Votre mot de passe vous sera demandé.
-integration.error.invalidStyle=Le style que vous avez sélectionné ne semble pas valide. Si vous l'avez créé vous-même, assurez-vous qu'il satisfait les conditions de validation décrites sur http://zotero.org/support/dev/citation_styles. Autrement, essayez de sélectionner un autre style.
+integration.error.invalidStyle=Le style que vous avez sélectionné ne semble pas valide. Si vous l'avez créé vous-même, assurez-vous qu'il satisfait les conditions de validation décrites sur https://github.com/citation-style-language/styles/wiki/Validation. Autrement, essayez de sélectionner un autre style.
 integration.error.fieldTypeMismatch=Zotero ne peut pas mettre à jour ce document car il a été créé par un autre traitement de texte avec un encodage incompatible des champs. Afin de le rendre compatible avec Word et OpenOffice.org/LibreOffice/NeoOffice, ouvrez le document avec le traitement de texte avec lequel il a été originellement créé, ouvrez les Préférences Zotero du document et choisissez de le formater en utilisant des Signets.
 
 integration.replace=Remplacer ce champ Zotero ?
-integration.missingItem.single=Ce document n'existe plus dans votre base de données Zotero. Voulez-vous sélectionner un document de substitution ?
-integration.missingItem.multiple=Le document %1$S de cette citation n'existe plus dans votre base de données Zotero. Voulez-vous sélectionner un document de substitution ?
+integration.missingItem.single=La citation en surbrillance n'existe plus dans votre base de données Zotero. Voulez-vous sélectionner un document de substitution ?
+integration.missingItem.multiple=Le document %1$S de la citation en surbrillance n'existe plus dans votre base de données Zotero. Voulez-vous sélectionner un document de substitution ?
 integration.missingItem.description=Cliquer sur "Non" supprimera les codes de champ pour les citations comportant ce document, conservant le texte de la citation mais le supprimant de votre bibliographie.
 integration.removeCodesWarning=La suppression des codes de champ empêchera Zotero de mettre à jour les citations et bibliographies dans ce document. Voulez-vous vraiment continuer ?
 integration.upgradeWarning=Votre document doit être mis à jour de façon définitive pour fonctionner avec Zotero 2.0b7 ou ultérieur. Il est conseillé de faire une sauvegarde avant de poursuivre. Voulez-vous vraiment continuer ?
@@ -640,19 +705,27 @@ integration.corruptField.description=Cliquer "Non" effacera les codes de champ p
 integration.corruptBibliography=Le code de champ Zotero pour votre bibliographie est corrompu. Zotero doit-il effacer ce code de champ et créer une nouvelle bibliographie ?
 integration.corruptBibliography.description=Tous les documents cités dans le texte figureront dans la nouvelle bibliographie mais les modifications réalisées avec la boîte de dialogue "Modifier la bibliographie" serons perdues.
 integration.citationChanged=Vous avez modifié cette citation depuis que Zotero l'a créée. Voulez-vous conserver vos modifications et empêcher de futures mises à jour ?
-integration.citationChanged.description=Cliquer sur "Oui" empêchera Zotero de mettre à jour cette citation si vous ajoutez des citations supplémentaires, changez de style ou modifiez les références auxquelles elle se réfère. Cliquer sur "Non" effacera vos modifications.
+integration.citationChanged.description=Cliquer sur "Oui" empêchera Zotero de mettre à jour cette citation (si vous ajoutez des citations supplémentaires, changez de style ou modifiez, dans Zotero, la référence à laquelle cette citation se réfère). Cliquer sur "Non" effacera vos modifications.
 integration.citationChanged.edit=Vous avez modifié cette citation depuis que Zotero l'a créée. Son édition supprimera vos modifications. Voulez-vous continuer ?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Installer le style "%1$S" à partir de %2$S ?
 styles.updateStyle=Actualiser le style "%1$S" existant avec "%2$S" à partir de %3$S ?
 styles.installed=Le style "%S" a été installé avec succès.
 styles.installError=%S ne paraît pas être un fichier de style valide.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S fait référence à un fichier CSL non valide ou inexistant ayant %2$S comme source.
 styles.deleteStyle=Voulez-vous vraiment supprimer le style "%1$S"?
 styles.deleteStyles=Voulez-vous vraiment supprimer les styles sélectionnés ?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Annuler la synchronisation
-sync.openSyncPreferences=Ouvrir les préférences de synchronisation…
+sync.openSyncPreferences=Ouvrir les préférences de synchronisation
 sync.resetGroupAndSync=Réinitialiser le groupe et synchroniser
 sync.removeGroupsAndSync=Retirer les groupes et synchroniser
 sync.localObject=Objet local
@@ -660,8 +733,10 @@ sync.remoteObject=Objet distant
 sync.mergedObject=Objet fusionné
 
 sync.error.usernameNotSet=Identifiant non défini
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Mot de passe non défini
 sync.error.invalidLogin=Identifiant ou mot de passe invalide
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Veuillez entrer votre mot de passe.
 sync.error.loginManagerCorrupted1=Zotero ne peut pas accéder à vos informations de connexion, probablement en raison de la corruption de la base de données du gestionnaire de connexions de %S.
 sync.error.loginManagerCorrupted2=Fermez %1$S, sauvegardez signons.* puis supprimez-le de votre profil %2$S, et finalement entrez à nouveau vos informations de connexion dans le panneau de synchronisation dans les préférences de Zotero.
@@ -672,19 +747,57 @@ sync.error.groupWillBeReset=Si vous poursuivez, votre copie du groupe sera réin
 sync.error.copyChangedItems=Pour avoir une chance de copier vos modifications ailleurs ou pour demander un accès en écriture à un administrateur du groupe, annulez la synchronisation maintenant.
 sync.error.manualInterventionRequired=Une synchronisation automatique a causé un conflit qui requiert une intervention manuelle.
 sync.error.clickSyncIcon=Cliquez sur l'icône de synchronisation pour synchroniser manuellement.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Pas encore synchronisé.
 sync.status.lastSync=Dernière synchronisation :
 sync.status.loggingIn=Connexion au serveur de synchronisation
 sync.status.gettingUpdatedData=Obtention des données mises à jour à partir du serveur de synchronisation
-sync.status.processingUpdatedData=Traitement des données mises à jour
+sync.status.processingUpdatedData=Traitement des données mises à jour depuis le serveur de synchronisation
 sync.status.uploadingData=Mise en ligne des données vers le serveur de synchronisation
 sync.status.uploadAccepted=Mise en ligne acceptée — en attente du serveur de synchronisation
 sync.status.syncingFiles=Synchronisation des fichiers en cours
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKo restant
 sync.storage.filesRemaining=%1$S/%2$S fichiers
 sync.storage.none=Aucun
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Fichier local
 sync.storage.remoteFile=Fichier distant
 sync.storage.savedFile=Fichier enregistré
@@ -692,31 +805,44 @@ sync.storage.serverConfigurationVerified=Configuration du serveur vérifiée
 sync.storage.fileSyncSetUp=La synchronisation de fichier a été configurée avec succès.
 sync.storage.openAccountSettings=Ouvrir les paramètres du compte
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Le serveur %S n'a pu être atteint.
 sync.storage.error.permissionDeniedAtAddress=Vous n'avez pas le droit de créer un répertoire Zotero à l'adresse suivante :
 sync.storage.error.checkFileSyncSettings=Veuillez vérifier vos paramètres de synchronisation de fichier ou contacter l'administrateur de votre serveur.
 sync.storage.error.verificationFailed=La vérification %S a échoué. Vérifiez vos paramètres de synchronisation de fichier dans le panneau de synchronisation des préférences Zotero.
 sync.storage.error.fileNotCreated=Le fichier '%S' n'a pas pu être créé dans le répertoire 'storage' de Zotero.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Vous n'avez plus d'accès en modification de fichier pour le groupe Zotero '%S', et les fichiers que vous avez ajoutés ou modifiés ne peuvent pas être synchronisés vers le serveur.
 sync.storage.error.copyChangedItems=Pour avoir une chance de copier les documents et fichiers modifiés ailleurs, annulez la synchronisation maintenant.
 sync.storage.error.fileUploadFailed=La mise en ligne du fichier a échoué.
 sync.storage.error.directoryNotFound=Le répertoire est introuvable.
 sync.storage.error.doesNotExist=%S n'existe pas.
 sync.storage.error.createNow=Voulez-vous le créer maintenant?
-sync.storage.error.webdav.enterURL=Veuillez entrer une URL WebDAV.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S n'est pas une URL WebDAV valide.
 sync.storage.error.webdav.invalidLogin=Le serveur WebDAV n'a pas accepté l'identifiant et le mot de passe que vous avez entrés.
 sync.storage.error.webdav.permissionDenied=Vous n'avez pas le droit d'accéder à %S sur le serveur WebDAV.
 sync.storage.error.webdav.insufficientSpace=Une mise en ligne de fichier a échoué en raison d'un manque d'espace sur le serveur WebDAV.
-sync.storage.error.webdav.sslCertificateError=Une erreur de certificat SSL s'est produite en se connectant à %S.
-sync.storage.error.webdav.sslConnectionError=Une erreur de connexion SSL s'est produite en se connectant à %S.
+sync.storage.error.webdav.sslCertificateError=Une erreur de certificat SSL s'est produite en se connectant à %S
+sync.storage.error.webdav.sslConnectionError=Une erreur de connexion SSL s'est produite en se connectant à %S
 sync.storage.error.webdav.loadURLForMoreInfo=Entrez votre URL WebDAV dans votre navigateur pour plus d'information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Consultez la documentation relative aux exceptions de certificats auto-signés (certificate override) pour plus d'information.
 sync.storage.error.webdav.loadURL=Charger l'URL WebDAV
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Vous avez atteint votre quota de stockage de fichiers Zotero. Certains fichiers n'ont pas été mis en ligne. D'autres données Zotero continueront d'être synchronisées avec le serveur.
 sync.storage.error.zfs.personalQuotaReached2=Consultez les paramètres de votre compte zotero.org pour plus d'options de stockage.
 sync.storage.error.zfs.groupQuotaReached1=Le groupe '%S' a atteint son quota de stockage de fichiers Zotero. Certains fichiers n'ont pas été mis en ligne. D'autres données Zotero continueront d'être synchronisées avec le serveur.
 sync.storage.error.zfs.groupQuotaReached2=Le propriétaire du groupe peut augmenter la capacité de stockage du groupe à partir de la section des paramètres de stockage sur zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Enregistrer le marqueur
 sync.longTagFixer.saveTags=Enregistrer les marqueurs
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Le texte du PDF n'a pas pu être lu.
 recognizePDF.noMatches=Il n'a pas été trouvé de référence correspondante.
 recognizePDF.fileNotFound=Fichier non trouvé.
 recognizePDF.limit=Limite de la requête atteinte. Réessayez plus tard.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Récupération des métadonnées achevée.
 recognizePDF.close.label=Fermer
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Sélectionnez l'emplacement de sauvegarde du fichier mis en forme
 rtfScan.scannedFileSuffix=(Analysé)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=La recherche a échoué
 lookup.failure.description=Zotero n'a pas trouvé d'enregistrement pour l'identifiant spécifié. Veuillez vérifier l'identifiant et réessayer.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Afficher en ligne
 locate.online.tooltip=Aller à ce document en ligne
@@ -781,7 +921,7 @@ standalone.addonInstallationFailed.body=L'extension "%S" ne peut pas être insta
 connector.error.title=Erreur du connecteur Zotero
 connector.standaloneOpen=Votre base de données est inaccessible car Zotero Standalone est actuellement ouvert. Veuillez visualiser vos documents dans Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero peut reconnaître une référence sur cette page. Cliquez sur cette icône dans la barre d'adresse pour enregistrer cette référence dans votre bibliothèque Zotero.
+firstRunGuidance.saveIcon=Zotero a détecté une référence sur cette page. Cliquez sur cette icône dans la barre d'adresse pour enregistrer cette référence dans votre bibliothèque Zotero.
 firstRunGuidance.authorMenu=Zotero vous permet également de préciser les éditeurs scientifiques, directeurs de publication et les traducteurs. Vous pouvez changer un auteur en éditeur ou en traducteur en cliquant sur le triangle à gauche de "Auteur".
 firstRunGuidance.quickFormat=Tapez son titre ou son auteur pour rechercher une référence.\n\nAprès l'avoir sélectionnée, cliquez sur la bulle ou appuyer sur Ctrl-\u2193 pour ajouter les numéros des pages, un préfixe ou un suffixe. Vous pouvez aussi inclure un numéro de page en même temps que vos termes de recherche afin de l'ajouter directement.\n\nVous pouvez modifier les citations directement dans le document du traitement de texte.
-firstRunGuidance.quickFormatMac=Tapez son titre ou son auteur pour rechercher une référence.\n\nAprès l'avoir sélectionnée, cliquez sur la bulle ou appuyer sur Ctrl-\u2193 pour ajouter les numéros des pages, un préfixe ou un suffixe. Vous pouvez aussi inclure un numéro de page en même temps que vos termes de recherche afin de l'ajouter directement.\n\nVous pouvez modifier les citations directement dans le document du traitement de texte.
+firstRunGuidance.quickFormatMac=Tapez son titre ou son auteur pour rechercher une référence.\n\nAprès l'avoir sélectionnée, cliquez sur la bulle ou appuyer sur Cmd-\u2193 pour ajouter les numéros des pages, un préfixe ou un suffixe. Vous pouvez aussi inclure un numéro de page en même temps que vos termes de recherche afin de l'ajouter directement.\n\nVous pouvez modifier les citations directement dans le document du traitement de texte.
diff --git a/chrome/locale/gl-ES/zotero/about.dtd b/chrome/locale/gl-ES/zotero/about.dtd
index 2e1558c7b6..ecf076a9bc 100644
--- a/chrome/locale/gl-ES/zotero/about.dtd
+++ b/chrome/locale/gl-ES/zotero/about.dtd
@@ -3,10 +3,11 @@
 <!ENTITY zotero.director "Director">
 <!ENTITY zotero.directors "Directores:">
 <!ENTITY zotero.developers "Desenvolvedores">
-<!ENTITY zotero.alumni "Antigos alumnos:">
+<!ENTITY zotero.alumni "Alumnos:">
 <!ENTITY zotero.about.localizations "Idiomas dispoñibles">
 <!ENTITY zotero.about.additionalSoftware "Software de terceiros e normas:">
 <!ENTITY zotero.executiveProducer "Produtor executivo:">
 <!ENTITY zotero.thanks "Agradecementos especiais:">
 <!ENTITY zotero.about.close "Pechar">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Outros créditos e recoñecementos">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/gl-ES/zotero/preferences.dtd b/chrome/locale/gl-ES/zotero/preferences.dtd
index 81d1850f7a..9d84953e73 100644
--- a/chrome/locale/gl-ES/zotero/preferences.dtd
+++ b/chrome/locale/gl-ES/zotero/preferences.dtd
@@ -3,11 +3,12 @@
 <!ENTITY zotero.preferences.default "Por defecto:">
 <!ENTITY zotero.preferences.items "Elementos">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Xeral">
 
 <!ENTITY zotero.preferences.userInterface "Interface de usuario">
-<!ENTITY zotero.preferences.showIn "Mostrar o Zotero en:">
+<!ENTITY zotero.preferences.showIn "Cargar Zotero en:">
 <!ENTITY zotero.preferences.showIn.browserPane "Panel do navegador">
 <!ENTITY zotero.preferences.showIn.separateTab "Lapela propia">
 <!ENTITY zotero.preferences.showIn.appTab "Lapela de aplicativos">
@@ -38,7 +39,7 @@
 <!ENTITY zotero.preferences.groups.childNotes "notas fillas">
 <!ENTITY zotero.preferences.groups.childFiles "capturas de imaxe fillas e ficheiros importados">
 <!ENTITY zotero.preferences.groups.childLinks "ligazóns fillas">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "etiquetas">
 
 <!ENTITY zotero.preferences.openurl.caption "OpenURL">
 
@@ -57,11 +58,16 @@
 <!ENTITY zotero.preferences.sync.about "Acerca da sincronización">
 <!ENTITY zotero.preferences.sync.fileSyncing "Sincronizando o ficheiro">
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
-<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Sincronizar os ficheiros adxuntos da miña biblioteca usando">
+<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Sincronizar os ficheiros adxuntos da Miña Biblioteca usando">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Sincronizar os ficheiros adxuntos das bibliotecas de grupo utilizando o almacenamento de Zotero">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Ao usar o almacenamento de Zotero estas a aceptar as obrigas establecidas nos seus">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "Termos e Condicións">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Sincronización completa co servidor de Zotero">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Eliminar todos os datos locais de Zotero e restauralos sincronizando co servidor.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Restaurar a partir do servidor de Zotero">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Borrar todos os datos do servidor e substituír con datos locais de Zotero.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Reiniciar o historial de sincronización de ficheiros">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Forzar a comprobación do servidor de almacenamento para todos os ficheiros locais anexos.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reiniciar...">
 
 
@@ -114,13 +121,14 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Título">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Actualizado">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Obter máis estilos...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Atallos de teclado">
 
 <!ENTITY zotero.preferences.keys.openZotero "Abrir/Pechar o panel de Zotero">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Cambiar ao modo de pantalla completa">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "Foco no panel de bibliotecas">
 <!ENTITY zotero.preferences.keys.quicksearch "Busca rápida">
 <!ENTITY zotero.preferences.keys.newItem "Crear un novo elemento">
 <!ENTITY zotero.preferences.keys.newNote "Crear unha nova nota">
@@ -149,11 +157,12 @@
 <!ENTITY zotero.preferences.proxies.variables "Pode usar as seguintes variables no seu esquema de proxy:">
 <!ENTITY zotero.preferences.proxies.h_variable "&#37;h - O nome do host do sitio a través do proxy (por exemplo, www.zotero.org)">
 <!ENTITY zotero.preferences.proxies.p_variable "&#37;p - A ruta da páxina a través do proxy excluíndo a barra á esquerda (slash) (por exemplo, about/index.html)">
-<!ENTITY zotero.preferences.proxies.d_variable "&#37;d - A ruta do directorio (por exemplo, about/)">
+<!ENTITY zotero.preferences.proxies.d_variable "&#37;d - A ruta do cartafol (por exemplo, about/)">
 <!ENTITY zotero.preferences.proxies.f_variable "&#37;f - O nome do ficheiro (por exemplo, index.html)">
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Calquera cadea">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avanzado">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Localizador">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Xestor do motor de busca de artigos">
@@ -167,11 +176,17 @@
 <!ENTITY zotero.preferences.charset.importCharset "Importación a codificación de carácteres">
 <!ENTITY zotero.preferences.charset.displayExportOption "Mostrar a opción de codificación de caracteres na exportación">
 
-<!ENTITY zotero.preferences.dataDir "Localización do directorio de almacenamento">
-<!ENTITY zotero.preferences.dataDir.useProfile "Usar o directorio de perfís">
+<!ENTITY zotero.preferences.dataDir "Localización do cartafol de almacenamento">
+<!ENTITY zotero.preferences.dataDir.useProfile "Usar o cartafol de perfís">
 <!ENTITY zotero.preferences.dataDir.custom "Personalizado:">
 <!ENTITY zotero.preferences.dataDir.choose "Escoller...">
-<!ENTITY zotero.preferences.dataDir.reveal "Mostrar o directorio de datos">
+<!ENTITY zotero.preferences.dataDir.reveal "Mostrar o cartafol de datos">
+
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
 
 <!ENTITY zotero.preferences.dbMaintenance "Mantemento da base de datos">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Comprobar a integridade da base de datos">
diff --git a/chrome/locale/gl-ES/zotero/searchbox.dtd b/chrome/locale/gl-ES/zotero/searchbox.dtd
index 4822c2c78b..002ee21642 100644
--- a/chrome/locale/gl-ES/zotero/searchbox.dtd
+++ b/chrome/locale/gl-ES/zotero/searchbox.dtd
@@ -5,7 +5,7 @@
 <!ENTITY zotero.search.joinMode.all "todos">
 <!ENTITY zotero.search.joinMode.suffix "dos seguintes:">
 
-<!ENTITY zotero.search.recursive.label "Buscar en subcartafois">
+<!ENTITY zotero.search.recursive.label "Buscar en subcartafoles">
 <!ENTITY zotero.search.noChildren "Só mostrar temas de nivel superior">
 <!ENTITY zotero.search.includeParentsAndChildren "Incluír artigos pais e fillos de artigos coincidentes">
 
diff --git a/chrome/locale/gl-ES/zotero/standalone.dtd b/chrome/locale/gl-ES/zotero/standalone.dtd
index 83bc0216fd..d91d5480ac 100644
--- a/chrome/locale/gl-ES/zotero/standalone.dtd
+++ b/chrome/locale/gl-ES/zotero/standalone.dtd
@@ -12,12 +12,12 @@
 
 <!ENTITY fileMenu.label "Ficheiro">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
-<!ENTITY saveCmd.key "S">
+<!ENTITY saveCmd.label "Gardar...">
+<!ENTITY saveCmd.key "G">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
+<!ENTITY pageSetupCmd.label "Configurar a páxina...">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "Imprimir...">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "U">
 <!ENTITY closeCmd.label "Pechar">
@@ -54,7 +54,7 @@
 <!ENTITY selectAllCmd.label "Escoller todo">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opcións_">
+<!ENTITY preferencesCmd.label "Opcións...">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Preferencias">
 <!ENTITY preferencesCmdUnix.accesskey "n">
@@ -97,5 +97,5 @@
 <!ENTITY helpFeedbackPage.accesskey "S">
 <!ENTITY helpReportErrors.label "Informar de erros a Zotero">
 <!ENTITY helpReportErrors.accesskey "R">
-<!ENTITY helpCheckForUpdates.label "Comprobar se hai actualizacións_">
+<!ENTITY helpCheckForUpdates.label "Comprobar se hai actualizacións...">
 <!ENTITY helpCheckForUpdates.accesskey "U">
diff --git a/chrome/locale/gl-ES/zotero/zotero.dtd b/chrome/locale/gl-ES/zotero/zotero.dtd
index c3b31f5a2d..f8cee99746 100644
--- a/chrome/locale/gl-ES/zotero/zotero.dtd
+++ b/chrome/locale/gl-ES/zotero/zotero.dtd
@@ -5,13 +5,15 @@
 <!ENTITY zotero.general.edit "Editar">
 <!ENTITY zotero.general.delete "Borrar">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "O rexistro de erros pode incluír mensaxes que non gardan relación con Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Espere mentres que se presenta o informe de erro.">
 <!ENTITY zotero.errorReport.submitted "Presentouse o informe de erro .">
 <!ENTITY zotero.errorReport.reportID "ID do informe:">
-<!ENTITY zotero.errorReport.postToForums "Envie unha mensaxe aos foros do Zotero (forums.zotero.org) con este ID (identificador) do informe, unha descrición do problema e os pasos necesarios para reproducilo.">
+<!ENTITY zotero.errorReport.postToForums "Envíe unha mensaxe aos foros do Zotero (forums.zotero.org) con este ID (identificador) do informe, unha descrición do problema e os pasos necesarios para reproducilo.">
 <!ENTITY zotero.errorReport.notReviewed "Non se adoitan revisar os informes de erro agás que nos foros haxa unha referencia a eles.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Instalou unha nova versión de Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "A súa base de datos de Zotero tense que actualizar para traballar coa nova versión.">
 <!ENTITY zotero.upgrade.autoBackup "Antes de realizar cambios farase unha copia de seguridade automática da base de datos.">
@@ -56,25 +58,40 @@
 <!ENTITY zotero.items.rights_column "Dereitos">
 <!ENTITY zotero.items.dateAdded_column "Data de alta">
 <!ENTITY zotero.items.dateModified_column "Data de modificación">
-<!ENTITY zotero.items.numChildren_column "+">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Amosar na biblioteca">
 <!ENTITY zotero.items.menu.attach.note "Engadir unha nota">
 <!ENTITY zotero.items.menu.attach "Engadir un anexo">
-<!ENTITY zotero.items.menu.attach.snapshot "Adxuntar unha instantánea da páxina actual">
-<!ENTITY zotero.items.menu.attach.link "Adxuntar a ligazón á páxina actual">
-<!ENTITY zotero.items.menu.attach.link.uri "Adxuntar a ligazón ao URI...">
+<!ENTITY zotero.items.menu.attach.snapshot "Anexar unha instantánea da páxina actual">
+<!ENTITY zotero.items.menu.attach.link "Anexar a ligazón á páxina actual">
+<!ENTITY zotero.items.menu.attach.link.uri "Anexar a ligazón ao URI...">
 <!ENTITY zotero.items.menu.attach.file "Anexar a copia almacenada do ficheiro...">
 <!ENTITY zotero.items.menu.attach.fileLink "Anexar a ligazón do ficheiro...">
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restaurar na biblioteca">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicar os elementos seleccionados">
-<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+<!ENTITY zotero.items.menu.mergeItems "Xunguir os elemento...">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
-<!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "Escolle que versión deste elemento queres usar como o principal:">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "Escolle os campos a manter das outras versións do elemento:">
 
-<!ENTITY zotero.toolbar.newItem.label "Novo Elemento">
+<!ENTITY zotero.toolbar.newItem.label "Novo elemento">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Máis">
 <!ENTITY zotero.toolbar.newItemFromPage.label "Crear un novo elemento a partir da páxina actual">
 <!ENTITY zotero.toolbar.lookup.label "Engadir un elemento polo identificador">
@@ -89,7 +106,7 @@
 <!ENTITY zotero.toolbar.import.label "Importar...">
 <!ENTITY zotero.toolbar.importFromClipboard "Importar do portaretallos">
 <!ENTITY zotero.toolbar.export.label "Exportar a biblioteca...">
-<!ENTITY zotero.toolbar.rtfScan.label "RTF Scan...">
+<!ENTITY zotero.toolbar.rtfScan.label "Escáner RTF">
 <!ENTITY zotero.toolbar.timeline.label "Crear un cronograma">
 <!ENTITY zotero.toolbar.preferences.label "Preferencias...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Axuda e documentación">
@@ -104,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transformar o texto">
 <!ENTITY zotero.item.textTransform.titlecase "Maiúsculas comezando cada palabra">
 <!ENTITY zotero.item.textTransform.sentencecase "Maiúsculas comezando cada oración">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nota nova">
 <!ENTITY zotero.toolbar.note.standalone "Nova nota independente">
@@ -117,34 +135,42 @@
 <!ENTITY zotero.tagSelector.noTagsToDisplay "Non hai etiquetas que mostrar">
 <!ENTITY zotero.tagSelector.filter "Filtro:">
 <!ENTITY zotero.tagSelector.showAutomatic "Mostrar automáticamente">
-<!ENTITY zotero.tagSelector.displayAllInLibrary "Display all tags in this library">
+<!ENTITY zotero.tagSelector.displayAllInLibrary "Mostrar todas as etiquetas nesta librería">
 <!ENTITY zotero.tagSelector.selectVisible "Seleccionar o visible">
 <!ENTITY zotero.tagSelector.clearVisible "Desmarcar o visible">
 <!ENTITY zotero.tagSelector.clearAll "Desmarcar todo">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Renomear a etiqueta...">
 <!ENTITY zotero.tagSelector.deleteTag "Eliminar a etiqueta...">
 
-<!ENTITY zotero.lookup.description "Introduza na caixa de debaixo un ISBN, un DOI ou un PMID que buscar.">
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
 
-<!ENTITY zotero.selectitems.title "Seleccionar Elementos">
+<!ENTITY zotero.lookup.description "Introduza na caixa de debaixo un ISBN, un DOI ou un PMID que buscar.">
+<!ENTITY zotero.lookup.button.search "Search">
+
+<!ENTITY zotero.selectitems.title "Seleccionar elementos">
 <!ENTITY zotero.selectitems.intro.label "Seleccione os elementos que desexa engadir á súa biblioteca">
 <!ENTITY zotero.selectitems.cancel.label "Cancelar">
 <!ENTITY zotero.selectitems.select.label "Aceptar">
 
 <!ENTITY zotero.bibliography.title "Crear a bibliografía">
 <!ENTITY zotero.bibliography.style.label "Estilo de cita:">
-<!ENTITY zotero.bibliography.outputMode "Output Mode:">
-<!ENTITY zotero.bibliography.bibliography "Bibliography">
-<!ENTITY zotero.bibliography.outputMethod "Output Method:">
-<!ENTITY zotero.bibliography.saveAsRTF.label "Gravar como RTF">
-<!ENTITY zotero.bibliography.saveAsHTML.label "Gravar como HTML">
+<!ENTITY zotero.bibliography.outputMode "Modo de saída:">
+<!ENTITY zotero.bibliography.bibliography "Bibliografía:">
+<!ENTITY zotero.bibliography.outputMethod "Método de saída:">
+<!ENTITY zotero.bibliography.saveAsRTF.label "Gardar como RTF">
+<!ENTITY zotero.bibliography.saveAsHTML.label "Gardar como HTML">
 <!ENTITY zotero.bibliography.copyToClipboard.label "Copiar no portaretallos">
 <!ENTITY zotero.bibliography.print.label "Imprimir">
 
 <!ENTITY zotero.integration.docPrefs.title "Preferencias do documento">
 <!ENTITY zotero.integration.addEditCitation.title "Engadir/Editar a cita">
 <!ENTITY zotero.integration.editBibliography.title "Editar a bibliografía">
-<!ENTITY zotero.integration.quickFormatDialog.title "Quick Format Citation">
+<!ENTITY zotero.integration.quickFormatDialog.title "Formato rápido de citación">
 
 <!ENTITY zotero.progress.title "Progreso">
 
@@ -163,10 +189,10 @@
 <!ENTITY zotero.citation.suppressAuthor.label "Eliminar o autor">
 <!ENTITY zotero.citation.prefix.label "Prefixo:">
 <!ENTITY zotero.citation.suffix.label "Sufixo:">
-<!ENTITY zotero.citation.editorWarning.label "Warning: If you edit a citation in the editor it will no longer update to reflect changes in your database or the citation style.">
+<!ENTITY zotero.citation.editorWarning.label "Aviso: se editas a cita no editor non se actualizará máis reflictindo os cambios tanto na base de datos como no estilo de citas.">
 
 <!ENTITY zotero.richText.italic.label "Cursiva">
-<!ENTITY zotero.richText.bold.label "Grosa">
+<!ENTITY zotero.richText.bold.label "Negriña">
 <!ENTITY zotero.richText.underline.label "Subliñado">
 <!ENTITY zotero.richText.superscript.label "Superíndice">
 <!ENTITY zotero.richText.subscript.label "Subíndice">
@@ -205,11 +231,15 @@
 <!ENTITY zotero.sync.longTagFixer.split "Dividir">
 <!ENTITY zotero.sync.longTagFixer.splitAtThe "Dividir en">
 <!ENTITY zotero.sync.longTagFixer.character "carácter">
-<!ENTITY zotero.sync.longTagFixer.characters "carácteres">
+<!ENTITY zotero.sync.longTagFixer.characters "caracteres">
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Non se gardarán as etiquetas que non estean marcadas.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Eliminarase a etiqueta de todos os elementos.">
 
-<!ENTITY zotero.proxy.recognized.title "Recoñeceuse o Proxy">
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
+<!ENTITY zotero.proxy.recognized.title "Recoñeceuse o proxy">
 <!ENTITY zotero.proxy.recognized.warning "Engadir só proxies ligados desde a súa biblioteca, escola ou sitio web corporativo">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Engadir outros proxies permítelle a sitios maliciosos que se pasen por sitios nos cales confias.">
 <!ENTITY zotero.proxy.recognized.disable.label "Non redireccionar automaticamente as solicitudes a través de proxies previamente recoñecidos">
@@ -225,7 +255,7 @@
 <!ENTITY zotero.rtfScan.cancel.label "Cancelar">
 <!ENTITY zotero.rtfScan.citation.label "Cita">
 <!ENTITY zotero.rtfScan.itemName.label "Nome do elemento">
-<!ENTITY zotero.rtfScan.unmappedCitations.label "Citas non Mapeadas">
+<!ENTITY zotero.rtfScan.unmappedCitations.label "Citas non mapeadas">
 <!ENTITY zotero.rtfScan.ambiguousCitations.label "Citas ambiguas">
 <!ENTITY zotero.rtfScan.mappedCitations.label "Citas mapeadas">
 <!ENTITY zotero.rtfScan.introPage.label "Introdución">
diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties
index 156103551c..66b1fa5f17 100644
--- a/chrome/locale/gl-ES/zotero/zotero.properties
+++ b/chrome/locale/gl-ES/zotero/zotero.properties
@@ -11,9 +11,12 @@ general.restartRequiredForChange=Debe reiniciar %S para que o cambio teña efect
 general.restartRequiredForChanges=Debe reiniciar %S para que os cambios teña efecto.
 general.restartNow=Produciuse un erro.
 general.restartLater=Reiniciar máis tarde
-general.restartApp=Restart %S
+general.restartApp=Reiniciar %S
 general.errorHasOccurred=Produciuse un erro.
 general.unknownErrorOccurred=Produciuse un erro descoñecido.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Reinicie %S.
 general.restartFirefoxAndTryAgain=Reinicie %S e volva intentalo.
 general.checkForUpdate=Comprobar as actualizacións
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Vexa %S para máis información.
 general.enable=Activar
 general.disable=Desactivar
 general.remove=Remove
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Abrir a documentación
-general.numMore=%S more…
+general.numMore=%S máis...
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Está en marcha unha operación Zotero
 general.operationInProgress.waitUntilFinished=Agarde ata que teña acabado.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Prema %S para enviar un informe de erros aos desenvol
 errorReport.stepsToReproduce=Pasos a reproducir:
 errorReport.expectedResult=Resultado esperado:
 errorReport.actualResult=Resultado real:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Non se atopou o directorio de datos de Zotero.
 dataDir.previousDir=Directorio anterior:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Usar directorio de perfís de Firefox
 dataDir.selectDir=Seleccionar un directorio de datos  de Zotero
 dataDir.selectedDirNonEmpty.title=Directorio non baleiro
 dataDir.selectedDirNonEmpty.text=O directorio que seleccionou non está baleiro e non parece ser un directorio de datos de Zotero.\n\nAinda así quere que Zotero xestione ficheiros nese directorio?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Atopouse unha biblioteca de Zotero que xa existía
 dataDir.standaloneMigration.description=Semella que é a primeira vez que emprega %1%S. Quere que %1$S inporte as configuracións de %2$S e se use o directorio de datos que xa existe?
 dataDir.standaloneMigration.multipleProfiles=%1$S compartirá os seus directorio de datos co perfil empregado máis recementente.
@@ -114,10 +141,11 @@ pane.collections.newSavedSeach=Nova busca gardada
 pane.collections.savedSearchName=Introduza un nome para esta procura gardada:
 pane.collections.rename=Cambiar o nome da colección:
 pane.collections.library=A miña biblioteca
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Lixo
 pane.collections.untitled=Sen título
 pane.collections.unfiled=Elementos sen título
-pane.collections.duplicate=Duplicate Items
+pane.collections.duplicate=Elementos duplicados
 
 pane.collections.menu.rename.collection=Renomear a colección...
 pane.collections.menu.edit.savedSearch=Editar a busca gardada
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Seguro que desexa eliminar esta etiqueta?\n\nEli
 pane.tagSelector.numSelected.none=0 etiquetas seleccionadas
 pane.tagSelector.numSelected.singular=%S etiqueta seleccionada
 pane.tagSelector.numSelected.plural=%S etiquetas seleccionadas
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Cargando a lista de elementos ...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Mover ao lixo
 pane.items.trash=Seguro que quere mover o elemento seleccionado ao lixo?
 pane.items.trash.multiple=Seguro que quere mover os elementos seleccionados ao lixo?
@@ -176,10 +210,15 @@ pane.items.interview.manyParticipants=Entrevista realizada por %S et al.
 
 pane.item.selected.zero=Non hai elementos seleccionados
 pane.item.selected.multiple=%S elementos seleccionados
-pane.item.unselected.zero=No items in this view
-pane.item.unselected.singular=%S item in this view
-pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+pane.item.unselected.zero=Sen elementos nesta vista
+pane.item.unselected.singular=%S elementos nesta vista
+pane.item.unselected.plural=%S elementos nesta vista
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Cambiar o tipo de elemento
 pane.item.changeType.text=Está seguro de que quere cambiar o tipo de elemento?\n\nPerderanse os seguintes campos:
@@ -188,8 +227,8 @@ pane.item.defaultLastName=último
 pane.item.defaultFullName=nome completo
 pane.item.switchFieldMode.one=Cambiar a un só campo
 pane.item.switchFieldMode.two=Cambiar a dous campos
-pane.item.creator.moveUp=Move Up
-pane.item.creator.moveDown=Move Down
+pane.item.creator.moveUp=Subir
+pane.item.creator.moveDown=Baixar
 pane.item.notes.untitled=Nota sen título
 pane.item.notes.delete.confirm=Seguro que desexa eliminar esta nota?
 pane.item.notes.count.zero=%S notas:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S adxuntos:
 pane.item.attachments.count.singular=%S adxunto:
 pane.item.attachments.count.plural=%S adxuntos:
 pane.item.attachments.select=Escolla un ficheiro
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=prema aquí
-pane.item.tags=Etiquetas:
 pane.item.tags.count.zero=%S etiquetas:
 pane.item.tags.count.singular=%S etiqueta:
 pane.item.tags.count.plural=%S etiquetas:
 pane.item.tags.icon.user=Etiqueta engadida polo usuario
 pane.item.tags.icon.automatic=Etiqueta engadida automáticamente
-pane.item.related=Relacionado:
 pane.item.related.count.zero=%S relacionados:
 pane.item.related.count.singular=%S relacionado:
 pane.item.related.count.plural=%S relacionados:
@@ -245,7 +285,7 @@ itemTypes.map=Mapa
 itemTypes.blogPost=Entrada de blogue
 itemTypes.instantMessage=Mensaxe instantáneo
 itemTypes.forumPost=Entrada de foro
-itemTypes.audioRecording=Gravación de audio
+itemTypes.audioRecording=Gravación de son
 itemTypes.presentation=Presentación
 itemTypes.videoRecording=Gravación de vídeo
 itemTypes.tvBroadcast=Emisión de TV
@@ -402,7 +442,7 @@ creatorTypes.bookAuthor=Autor do libro
 fileTypes.webpage=Páxina web
 fileTypes.image=Imaxe
 fileTypes.pdf=PDF
-fileTypes.audio=Audio
+fileTypes.audio=Son
 fileTypes.video=Vídeo
 fileTypes.presentation=Presentación
 fileTypes.document=Documento
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Non pode engadir ficheiros á colección q
 ingester.saveToZotero=Gardar en Zotero
 ingester.saveToZoteroUsing=Gardar en Zotero empregando «%S»
 ingester.scraping=Gardando o elemento...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Gardouse o elemento
 ingester.scrapeError=Non se puido gardar o elemento
 ingester.scrapeErrorDescription=Produciuse un erro ao gardalo. Comprobe %S para obter máis información.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=Permitir sempre para este sitio
 
 ingester.importFile.title=Importar o ficheiro
 ingester.importFile.text=Quere importar o ficheiro «%S»?\n\nEses elementos engadiranse a unha nova colección.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Facendo unha busca…
 ingester.lookup.error=Aconteceu un erro ao buscar ese elemento.
@@ -441,20 +483,33 @@ db.dbRestoreFailed=A base de datos '%S' de Zotero parece haberse corrompido, e u
 db.integrityCheck.passed=Non se atoparon erros na base de datos.
 db.integrityCheck.failed=Atoparonse erros na base de datos de Zotero!
 db.integrityCheck.dbRepairTool=Pode utilizar a ferramenta de reparación da base de datos http://zotero.org/utils/dbfix para tratar de corrixir estes erros.
-db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
-db.integrityCheck.appRestartNeeded=%S will need to be restarted.
-db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
-db.integrityCheck.errorsFixed=The errors in your Zotero database have been corrected.
-db.integrityCheck.errorsNotFixed=Zotero was unable to correct all the errors in your database.
-db.integrityCheck.reportInForums=You can report this problem in the Zotero Forums.
+db.integrityCheck.repairAttempt=Zotero pode probar a arranxar estes erros.
+db.integrityCheck.appRestartNeeded=%S precisará reiniciarse.
+db.integrityCheck.fixAndRestart=Corrixir os erros e reiniciar %S
+db.integrityCheck.errorsFixed=Corrixíronse s erros na base de datos de Zotero.
+db.integrityCheck.errorsNotFixed=Zotero non puido corrixir todos os erros na base de datos.
+db.integrityCheck.reportInForums=Podes informar deste problema nos foros de Zotero.
 
 zotero.preferences.update.updated=Actualizado
 zotero.preferences.update.upToDate=Coa última actualización
 zotero.preferences.update.error=Erro
-zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when possible
+zotero.preferences.launchNonNativeFiles=Abrir os PDFs e outros ficheiros con %S sempre que sexa posible
 zotero.preferences.openurl.resolversFound.zero=%S resolvedores atopados
 zotero.preferences.openurl.resolversFound.singular=%S resolvedor atopado
 zotero.preferences.openurl.resolversFound.plural=%S resolvedores atopados
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Reconstruír o Índice
 zotero.preferences.search.rebuildWarning=Quere reconstruír todo o índice? Pode tardar.\n\nPara engadir só os elementos novos use %S.
 zotero.preferences.search.clearIndex=Borrar o índice
@@ -481,7 +536,7 @@ zotero.preferences.search.pdf.tryAgainOrViewManualInstructions=Inténteo de novo
 zotero.preferences.export.quickCopy.bibStyles=Estilos bibliográficos
 zotero.preferences.export.quickCopy.exportFormats=Formatos de exportación
 zotero.preferences.export.quickCopy.instructions=As copias rápidas permiten copiar referencias seleccionadas ao portaretallos pulsando unha tecla de acceso (%S) ou arrastrar obxectos desde un cadro de texto nunha páxina web.
-zotero.preferences.export.quickCopy.citationInstructions=For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
+zotero.preferences.export.quickCopy.citationInstructions=Para os estilos de bibliografía, podes copiar as citacións ou os rodapés premento %S ou apretando Shift antes de arrastrar e soltar os elementos.
 zotero.preferences.styles.addStyle=Engadir un estilo
 
 zotero.preferences.advanced.resetTranslatorsAndStyles=Recuperar tradutores e estilos
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Perderase todo tradutor
 zotero.preferences.advanced.resetStyles=Recuperar os estilos
 zotero.preferences.advanced.resetStyles.changesLost=Perderanse todo os estilos novo ou modificados.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Os seguintes ficheiros xa existían no directorio de destino e non se copiaron:
 dragAndDrop.filesNotFound=Os seguintes ficheiros non se atoparon e non se puideron copiar:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importar
 fileInterface.export=Exportar
 fileInterface.exportedItems=Elementos exportados
 fileInterface.imported=Importados
-fileInterface.fileFormatUnsupported=Non se puido atopar ningún tradutor para o ficheiro dado.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Bibliografía sen título
 fileInterface.bibliographyHTMLTitle=Bibliografía
 fileInterface.importError=Erro ao intentar importar o ficheiro seleccionado. Asegúrese de que o ficheiro é válido e volva intentalo.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Os elementos que seleccionou non conteñen refer
 fileInterface.bibliographyGenerationError=Produciuse un erro ao xerar a súa bibliografía. Inténteo de novo.
 fileInterface.exportError=Produciuse un erro ao intentar a exportación do ficheiro seleccionado.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Modo de busca avanzada - pulse Enter para buscar.
 searchInProgress=Busca en curso - espere.
 
@@ -535,7 +599,7 @@ searchConditions.type=Tipo
 searchConditions.thesisType=Tipo de tesis
 searchConditions.reportType=Tipo de informe
 searchConditions.videoRecordingFormat=Formato de gravación de vídeo
-searchConditions.audioFileType=Tipo de ficheiro de audio
+searchConditions.audioFileType=Tipo de ficheiro de son
 searchConditions.audioRecordingFormat=Formato de gravación de audio
 searchConditions.letterType=Tipo de carta
 searchConditions.interviewMedium=Medio da entrevista
@@ -556,7 +620,7 @@ fulltext.indexState.partial=Parcial
 
 exportOptions.exportNotes=Exportar Notas
 exportOptions.exportFileData=Exportar Arquivos
-exportOptions.useJournalAbbreviation=Use Journal Abbreviation
+exportOptions.useJournalAbbreviation=Usar a abreviación de xornal
 charset.UTF8withoutBOM=Unicode (UTF-8 sen BOM)
 charset.autoDetect=(detección automática)
 
@@ -572,8 +636,8 @@ citation.multipleSources=Múltiples fontes...
 citation.singleSource=Fonte única....
 citation.showEditor=Mostrar o editor
 citation.hideEditor=Agochar o editor
-citation.citations=Citations
-citation.notes=Notes
+citation.citations=Citacións
+citation.notes=Notas
 
 report.title.default=Informe de Zotero
 report.parentItem=Artigo pai:
@@ -613,6 +677,7 @@ integration.cited.loading=Cargando os elementos citados...
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Cita en branco
 integration.emptyCitationWarning.body=A cita que indicou estaría baleira co estilo que está seleccionado actualmente. Seguro que desexa engadila?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Esta versión do engadido o para procesador de texto de Zotero ($INTEGRATION_VERSION) é incompatible coa versión de Zotero (%1$S) que está instalada. Asegúrese de usar as últimas versións de ámbolos dous complementos.
 integration.error.incompatibleVersion2=Zotero %1$S require %2$S %3$S ou superior. Descargue a última versión de dende %2$S zotero.org
@@ -643,14 +708,22 @@ integration.citationChanged=Modificou as citas dende que Zotero as xerou. Quere
 integration.citationChanged.description=Premendo «Si» evítase que Zotero actualice a cita cando se engaden outras adicionais, cando se fan cambios de estilo ou cando se modifica a referencia á que se dirixen. Premendo «Non» elimínanse os vosos cambios anteriores.
 integration.citationChanged.edit=Modificou a cita desde que Zotero a xerou. Unha edición borra as súas modificacións. Quere continuar?.
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Instalar o estilo «%1$S» desde %2$S?
 styles.updateStyle=Actualizar o estilo «%1$S» con «%2$S» desde %3$S?
 styles.installed=Instalouse correctamente o estilo «%S».
 styles.installError=%S non parece ser un ficheiro de estilo válido.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S fai referencia a un ficheiro CSL que non é válido ou non existe e que ten como orixe %2$S.
 styles.deleteStyle=Seguro que desexa borrar o estilo «%1$S»?
 styles.deleteStyles=Seguro que desexa eliminar os estilos seleccionados?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancelar a sincronización
 sync.openSyncPreferences=Abrir as preferencias de sincronización ...
 sync.resetGroupAndSync=Reaxustar o grupo e a sincronización
@@ -660,8 +733,10 @@ sync.remoteObject=Obxecto remoto
 sync.mergedObject=Obxecto unido
 
 sync.error.usernameNotSet=Nome de usuario sen definir
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Contrasinal sen definir
 sync.error.invalidLogin=Nome de usuario ou contrasinal non válidos
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Introduza un contrasinal.
 sync.error.loginManagerCorrupted1=Zotero non pode acceder a información de entrada, probablemente debido a unha base de datos de rexistro corrompida.
 sync.error.loginManagerCorrupted2=Peche o %S, faga unha copia de seguridade e elimine signons.* no seu perfil de %S e reintroduza a súa información de rexistro no panel de sincronización no panel de preferencias do Zotero.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Se continúa, a súa copia do grupo será restaurada
 sync.error.copyChangedItems=Cancele a sincronización se antes prefire copiar os cambios noutro lugar ou solicitar o acceso de escritura a un administrador do grupo.
 sync.error.manualInterventionRequired=Unha sincronización automática produciu un conflito que require resolvelo manualmente.
 sync.error.clickSyncIcon=Faga clic na icona de sincronización para sincronizar a man.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Aínda non sincronizado
 sync.status.lastSync=Última sincronización:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Enviando datos ao servidor de sincronización
 sync.status.uploadAccepted=Carga aceptada \— esperando polo servidor de sincronización
 sync.status.syncingFiles=Sincronizando ficheiros
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SkB restantes
 sync.storage.filesRemaining=ficheiros %1$S/%2$S
 sync.storage.none=Ningún
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Ficheiro local
 sync.storage.remoteFile=Ficheiro remoto
 sync.storage.savedFile=Ficheiro gardado
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Verificada a configuración do servidor
 sync.storage.fileSyncSetUp=A sincronización de arquivos está configurada correctamente.
 sync.storage.openAccountSettings=Abrir a Configuración da Conta
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Non se pode localizar o servidor %S.
 sync.storage.error.permissionDeniedAtAddress=Non ten permiso para crear un directorio Zotero no seguinte enderezo:
 sync.storage.error.checkFileSyncSettings=Verifique as opcións de sincronización de ficheiros ou contacte co seu administrador do servidor.
 sync.storage.error.verificationFailed=Fallou a verificación de %S. Comprobe as súas opcións de sincronización de ficheiros no panel de sincronización de preferencias de Zotero.
 sync.storage.error.fileNotCreated=Non se puido crear o ficheiro «%S» no directorio de almacenamento de Zotero.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Xa non ten acceso a edición de ficheiros no grupo de Zotero '%S' e os ficheiros que acaba de engadir o ou editar xa non poden sincronizarse co servidor.
 sync.storage.error.copyChangedItems=Cancele agora a sincronización se desexa unha oportunidade de copiar os elementos alterados e os arquivos noutro lugar.
 sync.storage.error.fileUploadFailed=Fallou a carga do ficheiro.
 sync.storage.error.directoryNotFound=Directorio non atopado
 sync.storage.error.doesNotExist=%S non existe.
 sync.storage.error.createNow=Quere crealo agora?
-sync.storage.error.webdav.enterURL=Escriba a URL WebDAV.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S non é unha URL WebDAV válida.
 sync.storage.error.webdav.invalidLogin=O servidor WebDAV non acepta o nome de usuario e o contrasinal que inseriu.
 sync.storage.error.webdav.permissionDenied=Non ten permiso para acceder a %S no servidor WebDAV.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=Erro de conexión SSL ao conectar c
 sync.storage.error.webdav.loadURLForMoreInfo=Cargue a súa URL WebDAV no navegador para ter máis información.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Vexa a documentación de sobreescritura do certificado para ter máis información.
 sync.storage.error.webdav.loadURL=Cargar a URL WebDAV
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Acadou a cota máxima de almacenamento de ficheiros de Zotero. Algúns ficheiros non se enviaron. Porén, outros datos de Zotero continuarán igualmente a súa sincronización no servidor.
 sync.storage.error.zfs.personalQuotaReached2=Vexa a configuración da súa conta zotero.org para as opcións de almacenamento adicional.
 sync.storage.error.zfs.groupQuotaReached1=O grupo «%S» acaba de acadar a cota máxima de almacenamento de ficheiros de Zotero. Porén, outros datos de Zotero continuarán igualmente a súa sincronización no servidor.
 sync.storage.error.zfs.groupQuotaReached2=O dono do grupo pode aumentar a capacidade de almacenamento do grupo na sección de opcións de almacenamento en zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Gardar a etiqueta
 sync.longTagFixer.saveTags=Gardar as etiquetas
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Non se puido ler o texto do PDF.
 recognizePDF.noMatches=Non se atoparon referencias que coincidan.
 recognizePDF.fileNotFound=Non se atopou o ficheiro.
 recognizePDF.limit=Acadouse o límite de consultas. Ténteo de novo máis tarde.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Recuperación completa de metadatos.
 recognizePDF.close.label=Pechar
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Formato de texto enriquecido (.rtf)
 rtfScan.saveTitle=Seleccione o lugar onde desexa gardar o ficheiro formatado
 rtfScan.scannedFileSuffix=(Analizando)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Fallou a busca
 lookup.failure.description=Zotero non atopou un rexistro para o identificador especificado. Verifique o identificador e ténteo de novo.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Ver en liña
 locate.online.tooltip=Ir a este elemento en liña
@@ -782,6 +922,6 @@ connector.error.title=Erro do conector de Zotero
 connector.standaloneOpen=A súa base de datos non se puido acceder xa que neste momento está aberto Zotero. Vexa os seus elementos empregando Zotero Standalone.
 
 firstRunGuidance.saveIcon=Zotero recoñece unha referencia nesta páxina. Faga clic na icona na dirección de barras para gardar esa referencia na súa biblioteca de Zotero.
-firstRunGuidance.authorMenu=Zotero permítelle ademais especificar os editores e tradutores. Escolléndoo neste menú pode asginar a un autor como editor ou tradutor. 
+firstRunGuidance.authorMenu=Zotero permítelle ademais especificar os editores e tradutores. Escolléndoo neste menú pode asignar a un autor como editor ou tradutor. 
 firstRunGuidance.quickFormat=Teclee un título ou autor para buscar unha referencia.\n\nDespois de facer a selección faga clic na burbulla ou prema Ctrl-\↓ para engadir números de páxina, prefixos ou sufixos. Así mesmo, pode incluír un número de páxina cos datos de busca e engadilo directamente.\n\Ademais, pode editar citas directamente dende o procesador de documentos de texto.
 firstRunGuidance.quickFormatMac=Teclee un título de autor para facer unha busca dunha referencia.\n\nDespois de ter feito a selección prema na burbulla ou prema Cmd-\↓ para engadir os números de páxina, prefixos ou sufixos. Igualmente, pode incluír un número de páxina co seus termos de busca empregados e engadilo directamente.\n\nPode ademais editar citas directamente desde o procesador de documentos de textos.
diff --git a/chrome/locale/he-IL/zotero/about.dtd b/chrome/locale/he-IL/zotero/about.dtd
index 3431ee161e..6daf3b01a8 100644
--- a/chrome/locale/he-IL/zotero/about.dtd
+++ b/chrome/locale/he-IL/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks ":תודות מיוחדות">
 <!ENTITY zotero.about.close "סגור">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/he-IL/zotero/preferences.dtd b/chrome/locale/he-IL/zotero/preferences.dtd
index 1fa6a038c6..36e55aee38 100644
--- a/chrome/locale/he-IL/zotero/preferences.dtd
+++ b/chrome/locale/he-IL/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default ":ברירת מחדל">
 <!ENTITY zotero.preferences.items "items">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "כללי">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.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.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.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.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.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">
@@ -70,6 +76,7 @@
 <!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 "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reset...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "כותרת">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Any string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "מתקדם">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "בחר...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "בדוק שלמות מסד נתונים">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
diff --git a/chrome/locale/he-IL/zotero/standalone.dtd b/chrome/locale/he-IL/zotero/standalone.dtd
index f63a223052..964754a027 100644
--- a/chrome/locale/he-IL/zotero/standalone.dtd
+++ b/chrome/locale/he-IL/zotero/standalone.dtd
@@ -1,35 +1,35 @@
-<!ENTITY preferencesCmdMac.label "Preferences…">
+<!ENTITY preferencesCmdMac.label "...העדפות">
 <!ENTITY preferencesCmdMac.commandkey ",">
-<!ENTITY servicesMenuMac.label "Services">
+<!ENTITY servicesMenuMac.label "שירותים">
 <!ENTITY hideThisAppCmdMac.label "Hide &brandShortName;">
 <!ENTITY hideThisAppCmdMac.commandkey "H">
-<!ENTITY hideOtherAppsCmdMac.label "Hide Others">
+<!ENTITY hideOtherAppsCmdMac.label "הסתר אחרים">
 <!ENTITY hideOtherAppsCmdMac.commandkey "H">
-<!ENTITY showAllAppsCmdMac.label "Show All">
-<!ENTITY quitApplicationCmdMac.label "Quit Zotero">
+<!ENTITY showAllAppsCmdMac.label "הצג הכל">
+<!ENTITY quitApplicationCmdMac.label "צא מ-Zotero">
 <!ENTITY quitApplicationCmdMac.key "Q">
 
 
-<!ENTITY fileMenu.label "File">
+<!ENTITY fileMenu.label "קובץ">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "שמירה...">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
 <!ENTITY pageSetupCmd.label "Page Setup…">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "הדפסה...">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
-<!ENTITY quitApplicationCmdWin.label "Exit">
+<!ENTITY quitApplicationCmdWin.label "יציאה">
 <!ENTITY quitApplicationCmdWin.accesskey "x">
 <!ENTITY quitApplicationCmd.label "Quit">
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Edit">
+<!ENTITY editMenu.label "עריכה">
 <!ENTITY editMenu.accesskey "E">
 <!ENTITY undoCmd.label "Undo">
 <!ENTITY undoCmd.key "Z">
@@ -37,60 +37,60 @@
 <!ENTITY redoCmd.label "Redo">
 <!ENTITY redoCmd.key "Y">
 <!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cut">
+<!ENTITY cutCmd.label "חתוך">
 <!ENTITY cutCmd.key "X">
 <!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copy">
+<!ENTITY copyCmd.label "העתק">
 <!ENTITY copyCmd.key "C">
 <!ENTITY copyCmd.accesskey "C">
-<!ENTITY copyCitationCmd.label "Copy Citation">
-<!ENTITY copyBibliographyCmd.label "Copy Bibliography">
-<!ENTITY pasteCmd.label "Paste">
+<!ENTITY copyCitationCmd.label "העתק ציטוט">
+<!ENTITY copyBibliographyCmd.label "העתק ביבליוגרפיה">
+<!ENTITY pasteCmd.label "הדבק">
 <!ENTITY pasteCmd.key "V">
 <!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Delete">
+<!ENTITY deleteCmd.label "מחק">
 <!ENTITY deleteCmd.key "D">
 <!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Select All">
+<!ENTITY selectAllCmd.label "בחר הכל">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Options…">
+<!ENTITY preferencesCmd.label "אפשרויות...">
 <!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferences">
+<!ENTITY preferencesCmdUnix.label "העדפות">
 <!ENTITY preferencesCmdUnix.accesskey "n">
 <!ENTITY findCmd.label "Find">
 <!ENTITY findCmd.accesskey "F">
 <!ENTITY findCmd.commandkey "f">
-<!ENTITY bidiSwitchPageDirectionItem.label "Switch Page Direction">
+<!ENTITY bidiSwitchPageDirectionItem.label "החלף כיוון עמוד">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
-<!ENTITY bidiSwitchTextDirectionItem.label "Switch Text Direction">
+<!ENTITY bidiSwitchTextDirectionItem.label "החלף כיוון טקסט">
 <!ENTITY bidiSwitchTextDirectionItem.accesskey "w">
 <!ENTITY bidiSwitchTextDirectionItem.commandkey "X">
 
 
-<!ENTITY toolsMenu.label "Tools">
+<!ENTITY toolsMenu.label "כלים">
 <!ENTITY toolsMenu.accesskey "T">
-<!ENTITY addons.label "Add-ons">
+<!ENTITY addons.label "תוספים">
 
 
 <!ENTITY minimizeWindow.key "m">
 <!ENTITY minimizeWindow.label "Minimize">
 <!ENTITY bringAllToFront.label "Bring All to Front">
 <!ENTITY zoomWindow.label "Zoom">
-<!ENTITY windowMenu.label "Window">
+<!ENTITY windowMenu.label "חלון">
 
 
-<!ENTITY helpMenu.label "Help">
+<!ENTITY helpMenu.label "עזרה">
 <!ENTITY helpMenu.accesskey "H">
 
 
-<!ENTITY helpMenuWin.label "Help">
+<!ENTITY helpMenuWin.label "עזרה">
 <!ENTITY helpMenuWin.accesskey "H">
 <!ENTITY helpMac.commandkey "?">
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
-<!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.label "תמיכה ותיעוד">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/he-IL/zotero/zotero.dtd b/chrome/locale/he-IL/zotero/zotero.dtd
index 24b2e95e75..12d4f4e9c5 100644
--- a/chrome/locale/he-IL/zotero/zotero.dtd
+++ b/chrome/locale/he-IL/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "ערוך">
 <!ENTITY zotero.general.delete "מחק">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!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.">
 <!ENTITY zotero.errorReport.submitted "Your error report has been submitted.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Please post a message to the Zotero forums (forums.zotero.org) with this Report ID, a description of the problem, and any steps necessary to reproduce it.">
 <!ENTITY zotero.errorReport.notReviewed "Error reports are generally not reviewed unless referred to in the forums.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "You have installed a new version of Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Your Zotero database must be upgraded to work with the new version.">
 <!ENTITY zotero.upgrade.autoBackup "Your existing database will be backed up automatically before any changes are made.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "זכויות">
 <!ENTITY zotero.items.dateAdded_column "תאריך הוספה">
 <!ENTITY zotero.items.dateModified_column "תאריך שינוי">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "הצג בספרייה">
 <!ENTITY zotero.items.menu.attach.note "הוסף פתק">
@@ -75,8 +93,8 @@
 
 <!ENTITY zotero.toolbar.newItem.label "פריט חדש">
 <!ENTITY zotero.toolbar.moreItemTypes.label "More">
-<!ENTITY zotero.toolbar.newItemFromPage.label "Create New Item from Current Page">
-<!ENTITY zotero.toolbar.lookup.label "Add Item by Identifier">
+<!ENTITY zotero.toolbar.newItemFromPage.label "Create Web Page Item from Current Page">
+<!ENTITY zotero.toolbar.lookup.label "Add Item(s) by Identifier">
 <!ENTITY zotero.toolbar.removeItem.label "הסר פריט">
 <!ENTITY zotero.toolbar.newCollection.label "...אוסף חדש">
 <!ENTITY zotero.toolbar.newGroup "New Group...">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transform Text">
 <!ENTITY zotero.item.textTransform.titlecase "Title Case">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "פתק חדש">
 <!ENTITY zotero.toolbar.note.standalone "New Standalone Note">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Select visible">
 <!ENTITY zotero.tagSelector.clearVisible "Deselect visible">
 <!ENTITY zotero.tagSelector.clearAll "Deselect all">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Rename Tag...">
 <!ENTITY zotero.tagSelector.deleteTag "מחק תג...">
 
-<!ENTITY zotero.lookup.description "Enter the ISBN, DOI, or PMID to look up in the box below.">
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
+<!ENTITY zotero.lookup.description "Enter one or more ISBNs, DOIs, or PMIDs to look up in the box below.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Select Items">
 <!ENTITY zotero.selectitems.intro.label "Select which items you'd like to add to your library">
@@ -208,6 +235,10 @@
 <!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.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!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/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties
index ee6e88b8d9..07ab489edd 100644
--- a/chrome/locale/he-IL/zotero/zotero.properties
+++ b/chrome/locale/he-IL/zotero/zotero.properties
@@ -14,8 +14,11 @@ general.restartLater=הפעל מחדש מאוחר יותר
 general.restartApp=Restart %S
 general.errorHasOccurred=ארעה שגיאה
 general.unknownErrorOccurred=An unknown error occurred.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=.הפעילו מחדש את פיירפוקס בבקשה
-general.restartFirefoxAndTryAgain=Please restart %S and try again.
+general.restartFirefoxAndTryAgain=Please restart Firefox and try again.
 general.checkForUpdate=בדוק אם יש עידכונים
 general.actionCannotBeUndone=This action cannot be undone.
 general.install=התקנה
@@ -35,8 +38,12 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=הסר
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -57,7 +64,7 @@ upgrade.advanceMessage=Press %S to upgrade now.
 upgrade.dbUpdateRequired=יש לעדכן את בסיס הנתונים של זוטרו.
 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 %S to try the upgrade again.
+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...
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Press %S to send an error report to the Zotero develo
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=The Zotero data directory could not be found.
 dataDir.previousDir=Previous directory:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Use %S profile directory
 dataDir.selectDir=Select a Zotero data directory
 dataDir.selectedDirNonEmpty.title=ספרייה אינה ריקה
 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?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=חיפוש שמור חדש
 pane.collections.savedSearchName=רשום שם לחיפוש השמור
 pane.collections.rename=שינוי שם אוסף
 pane.collections.library=הספרייה שלי
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Trash
 pane.collections.untitled=ללא שם
 pane.collections.unfiled=Unfiled Items
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=תג זה ימחק מכל הפריטים
 pane.tagSelector.numSelected.none=0 תגיות נבחרו
 pane.tagSelector.numSelected.singular=%S tag selected
 pane.tagSelector.numSelected.plural=%S tags selected
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=טוען רשימת פריטים...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
 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?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S items selected
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=שנה סוג פריט
 pane.item.changeType.text=Are you sure you want to change the item type?\n\nThe following fields will be lost:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S attachments:
 pane.item.attachments.count.singular=%S attachment:
 pane.item.attachments.count.plural=%S attachments:
 pane.item.attachments.select=בחר קובץ
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=לחץ כאן
-pane.item.tags=תגיות:
 pane.item.tags.count.zero=%S tags:
 pane.item.tags.count.singular=%S tag:
 pane.item.tags.count.plural=%S tags:
 pane.item.tags.icon.user=User-added tag
 pane.item.tags.icon.automatic=תגית שנוספה אוטומטית
-pane.item.related=Related:
 pane.item.related.count.zero=%S related:
 pane.item.related.count.singular=%S related:
 pane.item.related.count.plural=%S related:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=Saving Item...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=פריט נשמר.
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
@@ -427,13 +468,14 @@ ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
-db.dbCorrupted.restart=Please restart %S to attempt an automatic restore from the last backup.
+db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
 db.dbCorruptedNoBackup=The Zotero database '%S' appears to have become corrupted, and no automatic backup is available.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
 db.dbRestored=The Zotero database '%1$S' appears to have become corrupted.\n\nYour data was restored from the last automatic backup made on %2$S at %3$S. The damaged file was saved in your Zotero directory.
 db.dbRestoreFailed=The Zotero database '%S' appears to have become corrupted, and an attempt to restore from the last automatic backup failed.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S resolvers found
 zotero.preferences.openurl.resolversFound.singular=%S resolver found
 zotero.preferences.openurl.resolversFound.plural=%S resolvers found
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Rebuild Index
 zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
 zotero.preferences.search.clearIndex=Clear Index
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Any new or modified tra
 zotero.preferences.advanced.resetStyles=Reset Styles
 zotero.preferences.advanced.resetStyles.changesLost=Any new or modified styles will be lost.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
 
@@ -500,7 +559,8 @@ fileInterface.import=יבוא
 fileInterface.export=יצוא
 fileInterface.exportedItems=Exported Items
 fileInterface.imported=Imported
-fileInterface.fileFormatUnsupported=No translator could be found for the given file.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=ביבליוגרפיה ללא כותרת
 fileInterface.bibliographyHTMLTitle=ביבליוגרפיה
 fileInterface.importError=An error occurred while trying to import the selected file. Please ensure that the file is valid and try again.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=The items you have selected contain no reference
 fileInterface.bibliographyGenerationError=An error occurred generating your bibliography. Please try again.
 fileInterface.exportError=An error occurred while trying to export the selected file.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Advanced search mode — press Enter to search.
 searchInProgress=Search in progress — please wait.
 
@@ -613,11 +677,12 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Blank Citation
 integration.emptyCitationWarning.body=The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Error
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Zotero experienced an error updating your document.
 integration.error.mustInsertCitation=You must insert a citation before performing this operation.
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Install style "%1$S" from %2$S?
 styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
 styles.installed=The style "%S" was installed successfully.
-styles.installError=%S does not appear to be a valid style file.
+styles.installError="%S" is not a valid style file.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 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?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancel Sync
 sync.openSyncPreferences=Open Sync Preferences...
 sync.resetGroupAndSync=Reset Group and Sync
@@ -660,18 +733,55 @@ sync.remoteObject=Remote Object
 sync.mergedObject=Merged Object
 
 sync.error.usernameNotSet=Username not set
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Password not set
 sync.error.invalidLogin=Invalid username or password
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 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 %S.
+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 '%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.error.manualInterventionRequired=Conflicts have suspended automatic syncing.
+sync.error.clickSyncIcon=Click the sync icon to resolve them.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Not yet synced
 sync.status.lastSync=Last sync:
@@ -682,9 +792,12 @@ 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.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB remaining
 sync.storage.filesRemaining=%1$S/%2$S files
 sync.storage.none=None
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Local File
 sync.storage.remoteFile=Remote File
 sync.storage.savedFile=Saved File
@@ -692,17 +805,23 @@ sync.storage.serverConfigurationVerified=Server configuration verified
 sync.storage.fileSyncSetUp=File sync is successfully set up.
 sync.storage.openAccountSettings=Open Account Settings
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=The server %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=%S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
 sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=You no longer have file editing access to the Zotero group '%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=%S does not exist.
 sync.storage.error.createNow=Do you want to create it now?
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
 sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1=The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2=The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Save Tag
 sync.longTagFixer.saveTags=Save Tags
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Could not read text from PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=File not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Close
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(Scanned)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/hr-HR/zotero/about.dtd b/chrome/locale/hr-HR/zotero/about.dtd
index 5c8e4a7069..e93d6d7ad4 100644
--- a/chrome/locale/hr-HR/zotero/about.dtd
+++ b/chrome/locale/hr-HR/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Posebna zahvala:">
 <!ENTITY zotero.about.close "Zatvori">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/hr-HR/zotero/preferences.dtd b/chrome/locale/hr-HR/zotero/preferences.dtd
index c34d885121..6eded0b8e9 100644
--- a/chrome/locale/hr-HR/zotero/preferences.dtd
+++ b/chrome/locale/hr-HR/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Default:">
 <!ENTITY zotero.preferences.items "items">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "General">
 
@@ -59,9 +60,14 @@
 <!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.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.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.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.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">
@@ -70,6 +76,7 @@
 <!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 "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reset...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Any string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Advanced">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Choose...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
diff --git a/chrome/locale/hr-HR/zotero/standalone.dtd b/chrome/locale/hr-HR/zotero/standalone.dtd
index f63a223052..e02c6a5a54 100644
--- a/chrome/locale/hr-HR/zotero/standalone.dtd
+++ b/chrome/locale/hr-HR/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/hr-HR/zotero/zotero.dtd b/chrome/locale/hr-HR/zotero/zotero.dtd
index 5ea5c28572..286f163ffc 100644
--- a/chrome/locale/hr-HR/zotero/zotero.dtd
+++ b/chrome/locale/hr-HR/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Edit">
 <!ENTITY zotero.general.delete "Delete">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!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.">
 <!ENTITY zotero.errorReport.submitted "Your error report has been submitted.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Please post a message to the Zotero forums (forums.zotero.org) with this Report ID, a description of the problem, and any steps necessary to reproduce it.">
 <!ENTITY zotero.errorReport.notReviewed "Error reports are generally not reviewed unless referred to in the forums.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "You have installed a new version of Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Your Zotero database must be upgraded to work with the new version.">
 <!ENTITY zotero.upgrade.autoBackup "Your existing database will be backed up automatically before any changes are made.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Rights">
 <!ENTITY zotero.items.dateAdded_column "Date Added">
 <!ENTITY zotero.items.dateModified_column "Date Modified">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Show in Library">
 <!ENTITY zotero.items.menu.attach.note "Add Note">
@@ -75,8 +93,8 @@
 
 <!ENTITY zotero.toolbar.newItem.label "New Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label "More">
-<!ENTITY zotero.toolbar.newItemFromPage.label "Create New Item from Current Page">
-<!ENTITY zotero.toolbar.lookup.label "Add Item by Identifier">
+<!ENTITY zotero.toolbar.newItemFromPage.label "Create Web Page Item from Current Page">
+<!ENTITY zotero.toolbar.lookup.label "Add Item(s) by Identifier">
 <!ENTITY zotero.toolbar.removeItem.label "Remove Item...">
 <!ENTITY zotero.toolbar.newCollection.label "New Collection...">
 <!ENTITY zotero.toolbar.newGroup "New Group...">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transform Text">
 <!ENTITY zotero.item.textTransform.titlecase "Title Case">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "New Note">
 <!ENTITY zotero.toolbar.note.standalone "New Standalone Note">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Select visible">
 <!ENTITY zotero.tagSelector.clearVisible "Deselect visible">
 <!ENTITY zotero.tagSelector.clearAll "Deselect all">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Rename Tag...">
 <!ENTITY zotero.tagSelector.deleteTag "Delete Tag...">
 
-<!ENTITY zotero.lookup.description "Enter the ISBN, DOI, or PMID to look up in the box below.">
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
+<!ENTITY zotero.lookup.description "Enter one or more ISBNs, DOIs, or PMIDs to look up in the box below.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Select Items">
 <!ENTITY zotero.selectitems.intro.label "Select which items you'd like to add to your library">
@@ -208,6 +235,10 @@
 <!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.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!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/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties
index df8a91108a..a1e0892121 100644
--- a/chrome/locale/hr-HR/zotero/zotero.properties
+++ b/chrome/locale/hr-HR/zotero/zotero.properties
@@ -14,8 +14,11 @@ general.restartLater=Restart later
 general.restartApp=Restart %S
 general.errorHasOccurred=An error has occurred.
 general.unknownErrorOccurred=An unknown error occurred.
-general.restartFirefox=Please restart %S.
-general.restartFirefoxAndTryAgain=Please restart %S and try again.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
+general.restartFirefox=Please restart Firefox.
+general.restartFirefoxAndTryAgain=Please restart Firefox and try again.
 general.checkForUpdate=Check for update
 general.actionCannotBeUndone=This action cannot be undone.
 general.install=Install
@@ -35,8 +38,12 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -57,7 +64,7 @@ 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 %S to try the upgrade again.
+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...
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Press %S to send an error report to the Zotero develo
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=The Zotero data directory could not be found.
 dataDir.previousDir=Previous directory:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Use %S profile directory
 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?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=New Saved Search
 pane.collections.savedSearchName=Enter a name for this saved search:
 pane.collections.rename=Rename collection:
 pane.collections.library=My Library
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Trash
 pane.collections.untitled=Untitled
 pane.collections.unfiled=Unfiled Items
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Are you sure you want to delete this tag?\n\nThe
 pane.tagSelector.numSelected.none=0 tags selected
 pane.tagSelector.numSelected.singular=%S tag selected
 pane.tagSelector.numSelected.plural=%S tags selected
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Loading items list...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
 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?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S items selected
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Change Item Type
 pane.item.changeType.text=Are you sure you want to change the item type?\n\nThe following fields will be lost:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S attachments:
 pane.item.attachments.count.singular=%S attachment:
 pane.item.attachments.count.plural=%S attachments:
 pane.item.attachments.select=Select a File
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=click here
-pane.item.tags=Tags:
 pane.item.tags.count.zero=%S tags:
 pane.item.tags.count.singular=%S tag:
 pane.item.tags.count.plural=%S tags:
 pane.item.tags.icon.user=User-added tag
 pane.item.tags.icon.automatic=Automatically added tag
-pane.item.related=Related:
 pane.item.related.count.zero=%S related:
 pane.item.related.count.singular=%S related:
 pane.item.related.count.plural=%S related:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=Saving Item...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Item Saved
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
@@ -427,13 +468,14 @@ ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
-db.dbCorrupted.restart=Please restart %S to attempt an automatic restore from the last backup.
+db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
 db.dbCorruptedNoBackup=The Zotero database '%S' appears to have become corrupted, and no automatic backup is available.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
 db.dbRestored=The Zotero database '%1$S' appears to have become corrupted.\n\nYour data was restored from the last automatic backup made on %2$S at %3$S. The damaged file was saved in your Zotero directory.
 db.dbRestoreFailed=The Zotero database '%S' appears to have become corrupted, and an attempt to restore from the last automatic backup failed.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S resolvers found
 zotero.preferences.openurl.resolversFound.singular=%S resolver found
 zotero.preferences.openurl.resolversFound.plural=%S resolvers found
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Rebuild Index
 zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
 zotero.preferences.search.clearIndex=Clear Index
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Any new or modified tra
 zotero.preferences.advanced.resetStyles=Reset Styles
 zotero.preferences.advanced.resetStyles.changesLost=Any new or modified styles will be lost.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
 
@@ -500,7 +559,8 @@ fileInterface.import=Import
 fileInterface.export=Export
 fileInterface.exportedItems=Exported Items
 fileInterface.imported=Imported
-fileInterface.fileFormatUnsupported=No translator could be found for the given file.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 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.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=The items you have selected contain no reference
 fileInterface.bibliographyGenerationError=An error occurred generating your bibliography. Please try again.
 fileInterface.exportError=An error occurred while trying to export the selected file.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Advanced search mode — press Enter to search.
 searchInProgress=Search in progress — please wait.
 
@@ -613,11 +677,12 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Blank Citation
 integration.emptyCitationWarning.body=The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Error
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Zotero experienced an error updating your document.
 integration.error.mustInsertCitation=You must insert a citation before performing this operation.
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Install style "%1$S" from %2$S?
 styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
 styles.installed=The style "%S" was installed successfully.
-styles.installError=%S does not appear to be a valid style file.
+styles.installError="%S" is not a valid style file.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 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?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancel Sync
 sync.openSyncPreferences=Open Sync Preferences...
 sync.resetGroupAndSync=Reset Group and Sync
@@ -660,18 +733,55 @@ sync.remoteObject=Remote Object
 sync.mergedObject=Merged Object
 
 sync.error.usernameNotSet=Username not set
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Password not set
 sync.error.invalidLogin=Invalid username or password
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 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 %S.
+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 '%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.error.manualInterventionRequired=Conflicts have suspended automatic syncing.
+sync.error.clickSyncIcon=Click the sync icon to resolve them.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Not yet synced
 sync.status.lastSync=Last sync:
@@ -682,9 +792,12 @@ 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.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB remaining
 sync.storage.filesRemaining=%1$S/%2$S files
 sync.storage.none=None
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Local File
 sync.storage.remoteFile=Remote File
 sync.storage.savedFile=Saved File
@@ -692,17 +805,23 @@ sync.storage.serverConfigurationVerified=Server configuration verified
 sync.storage.fileSyncSetUp=File sync is successfully set up.
 sync.storage.openAccountSettings=Open Account Settings
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=The server %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=%S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
 sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=You no longer have file editing access to the Zotero group '%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=%S does not exist.
 sync.storage.error.createNow=Do you want to create it now?
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
 sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1=The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2=The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Save Tag
 sync.longTagFixer.saveTags=Save Tags
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Could not read text from PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=File not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Close
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(Scanned)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/hu-HU/zotero/about.dtd b/chrome/locale/hu-HU/zotero/about.dtd
index 80c1cccb09..de33f46cd1 100644
--- a/chrome/locale/hu-HU/zotero/about.dtd
+++ b/chrome/locale/hu-HU/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Külön köszönet:">
 <!ENTITY zotero.about.close "Bezárás">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/hu-HU/zotero/preferences.dtd b/chrome/locale/hu-HU/zotero/preferences.dtd
index b74a4af093..2ad5fc116c 100644
--- a/chrome/locale/hu-HU/zotero/preferences.dtd
+++ b/chrome/locale/hu-HU/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Alapértelmezett">
 <!ENTITY zotero.preferences.items "elemek">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Általános">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "A könyvtáramban található fájlok szinkronizálása">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "A csoport könyvtárához tartozó fájlok szinkronizálása a Zotero tárhely használatával">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "A Zotero tárhely használata esetén elfogadom a">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "felhasználási feltételeket">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Teljes szinkornizáció a Zotero szerverrel">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "A helyi adatok összefésülése a szerveren található adatokkal, a szinkronizációs előzmények figyelmen kívül hagyása.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Visszaállítás a Zotero szerverről">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "A szerveren található adatok törlése és frissítése a helyi adatokkal.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "A szinkronizációs előzmények törlése">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Valamennyi helyi csatolmány ellenőrzése a tárhely szerveren">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Visszaállítás">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "További stílusok telepítése...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Billentyűparancsok">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Bármilyen szöveg">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Haladó">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Tallózás...">
 <!ENTITY zotero.preferences.dataDir.reveal "Az adatkönyvtár mutatása">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Adatbázis karbantartás">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Az adatbázis integritásának ellenőrzése">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Fordítók és stílusok visszaállítása...">
diff --git a/chrome/locale/hu-HU/zotero/standalone.dtd b/chrome/locale/hu-HU/zotero/standalone.dtd
index f63a223052..e02c6a5a54 100644
--- a/chrome/locale/hu-HU/zotero/standalone.dtd
+++ b/chrome/locale/hu-HU/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/hu-HU/zotero/zotero.dtd b/chrome/locale/hu-HU/zotero/zotero.dtd
index 32ee74f03b..1e184cad2a 100644
--- a/chrome/locale/hu-HU/zotero/zotero.dtd
+++ b/chrome/locale/hu-HU/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Szerkesztés">
 <!ENTITY zotero.general.delete "Törlés">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "A hibanapló a Zoterohoz nem kapcsolódó bejegyzéseket is tartalmazhat">
 <!ENTITY zotero.errorReport.submissionInProgress "Várjon a hibajelentés elküldéséig.">
 <!ENTITY zotero.errorReport.submitted "A hibajelentés elküldve.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Küldje el a Zotero fórumba (forums.zotero.hu) a probléma leírását, hogy hogyan jutott idáig, ill. a hibaüzenet ID-jét .">
 <!ENTITY zotero.errorReport.notReviewed "A fórumba be nem küldött hibaüzenetek nem kerülnek kivizsgálásra.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "A Zotero új verziójának telepítése sikerült.">
 <!ENTITY zotero.upgrade.upgradeRequired "Frissíteni kell a Zotero adatbázist, hogy működjön az új verzióval.">
 <!ENTITY zotero.upgrade.autoBackup "Az adatbázisról a módosítás előtt biztonsági másolat készül.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Jogok">
 <!ENTITY zotero.items.dateAdded_column "Hozzáadás dátuma">
 <!ENTITY zotero.items.dateModified_column "Módosítás dátuma">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Megjelenítés a könyvtárban">
 <!ENTITY zotero.items.menu.attach.note "Jegyzet hozzáadása">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Szöveg átalakítása">
 <!ENTITY zotero.item.textTransform.titlecase "Szókezdő">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "New Note">
 <!ENTITY zotero.toolbar.note.standalone "Új önálló jegyzet">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Látható címkék kiválasztása">
 <!ENTITY zotero.tagSelector.clearVisible "Látható címkék kiválasztásának megszüntetése">
 <!ENTITY zotero.tagSelector.clearAll "Összes címke kiválasztásának megszüntetése">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Címke átnevezése...">
 <!ENTITY zotero.tagSelector.deleteTag "Címke törlése...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Adja meg az ISBN, DOI vagy PMID azonosítót az alábbi dobozban.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Elemek kiválasztása">
 <!ENTITY zotero.selectitems.intro.label "A könyvtárhoz hozzáadni kíván elemek kiválasztása">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "A jelöletlenül hagyott címkék nem lesznek elmentve.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Ez a címke törölve lesz valamennyi elemről.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Proxy felismerve">
 <!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/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties
index f7c500ec55..6dd4872eff 100644
--- a/chrome/locale/hu-HU/zotero/zotero.properties
+++ b/chrome/locale/hu-HU/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Újraindítás később
 general.restartApp=Restart %S
 general.errorHasOccurred=Hiba lépett fel.
 general.unknownErrorOccurred=Ismeretlen hiba.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Indítsa újra a Firefoxot.
 general.restartFirefoxAndTryAgain=Indítsa újra a Firefoxot és próbálja meg újra.
 general.checkForUpdate=Frissítések keresése
@@ -35,8 +38,12 @@ general.seeForMoreInformation=A %S bővebb információkat tartalmaz.
 general.enable=Bekapcsolás
 general.disable=Kikapcsolás
 general.remove=Remove
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=A Zotero dolgozik.
 general.operationInProgress.waitUntilFinished=Kérjük várjon, amíg a művelet befejeződik.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Nyomja meg a %S gombot a hibajelentés elküldéséhe
 errorReport.stepsToReproduce=Hiba reprodukálásához szükséges lépések:
 errorReport.expectedResult=Elvárt működés:
 errorReport.actualResult=Tényleges működés:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=A Zotero adatokat tartalmazó mappa nem található.
 dataDir.previousDir=Előző mappa:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=A Firefox profilkönyvtár használata
 dataDir.selectDir=Válassza ki a Zotero adatokat tartalmazó mappát
 dataDir.selectedDirNonEmpty.title=A mappa nem üres
 dataDir.selectedDirNonEmpty.text=A kiválasztott mappa nem üres és nem tartalmaz Zotero adatokat.\n\nEnnek ellenére hozza létre a Zotero fájlokat?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Új mentett keresés
 pane.collections.savedSearchName=Adjon meg egy új nevet az elmentett keresésnek
 pane.collections.rename=Új név:
 pane.collections.library=Teljes könyvtár
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Trash
 pane.collections.untitled=cím nélkül
 pane.collections.unfiled=Unfiled Items
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=A címke törlésének megerősítése?\n\nA cí
 pane.tagSelector.numSelected.none=Nincs kiválasztva címke
 pane.tagSelector.numSelected.singular=%S címke kiválasztva
 pane.tagSelector.numSelected.plural=%S címke kiválasztva
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Elemek listájának betöltése...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Áthelyezés a kukába
 pane.items.trash=A kukába helyezés megerősítése?
 pane.items.trash.multiple=A kukába helyezés megerősítése?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S elem kiválasztva
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Elem típusának módosítása
 pane.item.changeType.text=Az elemtípus módosításának megerősítése?\n\nA következő mezők elvesznek.
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S csatolmány:
 pane.item.attachments.count.singular=%S csatolmány:
 pane.item.attachments.count.plural=%S csatolmány:
 pane.item.attachments.select=Fájl kiválasztása
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=kattintson ide
-pane.item.tags=Címkék:
 pane.item.tags.count.zero=%S címke:
 pane.item.tags.count.singular=%S címke:
 pane.item.tags.count.plural=%S címke:
 pane.item.tags.icon.user=Felhasználó által adott címke
 pane.item.tags.icon.automatic=Automatikus címke
-pane.item.related=Kapcsolódó:
 pane.item.related.count.zero=%S kapcsolat:
 pane.item.related.count.singular=% kapcsolat:
 pane.item.related.count.plural=% kapcsolat:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Mentés a Zoteroba
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=Elem mentése...
+ingester.scrapingTo=Saving to
 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.
@@ -427,7 +468,8 @@ ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S linkfeloldó található
 zotero.preferences.openurl.resolversFound.singular=%S linkfeloldó található
 zotero.preferences.openurl.resolversFound.plural=%S linkfeloldó található
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Index újraépítése
 zotero.preferences.search.rebuildWarning=A teljes index újraépítésének megerősítése? Ez időbe telhet.\n\nAz eddig nem indexelt elemek indexeléséhez használja a %S-t.
 zotero.preferences.search.clearIndex=Index törlése
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Az új vagy módosítot
 zotero.preferences.advanced.resetStyles=Stílusok visszaállítása
 zotero.preferences.advanced.resetStyles.changesLost=Az új vagy módosított stílusok elvesznek.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Az alábbi fájlok már léteznek a célmappában, ezért nem kerültek bemásolásra.
 dragAndDrop.filesNotFound=Az alábbi fájlok nem találhatóak, ezért nem lehet őket másolni:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importálás
 fileInterface.export=Exportálás
 fileInterface.exportedItems=Exportált elemek
 fileInterface.imported=Importálva
-fileInterface.fileFormatUnsupported=A megadott fájlhoz nincs adatkonverter.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Cím nélküli bibliográfia
 fileInterface.bibliographyHTMLTitle=Bibliográfia
 fileInterface.importError=Hiba az kiválasztott fájl importálása során. Győződjön meg róla, hogy a fájl érvényes, és próbálja meg újra.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=A kiválasztott elemek nem tartalmaznak hivatkoz
 fileInterface.bibliographyGenerationError=Hiba az bibliográfia előállítása során. Próbálja meg újra.
 fileInterface.exportError=Hiba az kiválasztott fájl exportálása során.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Haladó keresés - a keresés az Enter billentyű leütésével indul
 searchInProgress=Keresés folyamatban
 
@@ -613,11 +677,12 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Blank Citation
 integration.emptyCitationWarning.body=The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Error
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Zotero experienced an error updating your document.
 integration.error.mustInsertCitation=You must insert a citation before performing this operation.
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=A "%1$S" stílus importálása a %2$S-ból?
 styles.updateStyle=A "%1$S" stílus lecserélése %2$S-re a %3$S-ból?
 styles.installed=A "%1$S" stílus importálása sikerült.
-styles.installError=%S does not appear to be a valid style file.
+styles.installError="%S" is not a valid style file.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 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?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Szinkronizáció elvetése
 sync.openSyncPreferences=Szinkronizációs beállítások megnyitása
 sync.resetGroupAndSync=Csoport és szinkronizáció visszaállítása
@@ -660,8 +733,10 @@ sync.remoteObject=Távoli objektum
 sync.mergedObject=Összefésült objektum
 
 sync.error.usernameNotSet=Felhasználónév nincs megadva
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=A jelszó nincs megadva
 sync.error.invalidLogin=Hibás felhasználónév vagy jelszó
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Adja meg a jelszót.
 sync.error.loginManagerCorrupted1=A Zotero nem fér hozzá a bejelentkezési adatokhoz, valószínűleg a Firefox bejelentkezési adatbázisának sérülése miatt.
 sync.error.loginManagerCorrupted2=Zárja be a Firefoxot, készítsen biztonsági másolatot, és törölje ki a bejelentkezési adatokat a Firefox profiljából, majd adja meg újra a bejelentkezési adatokat a Zotero beállítások Szinkronizáció nevű lapján.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Ha folytatja, a helyi változások elvesznek, és a
 sync.error.copyChangedItems=Ha jogosultságot szeretne kérni vagy egy másik csoporttal szinkronizálni, vesse el a szinkronizációt.
 sync.error.manualInterventionRequired=Az automatikus szinkronizáció hibát talált, ezért beavatkozásra van szükség.
 sync.error.clickSyncIcon=Kattintson a szinkronizációs ikonra a szinkronizáció kézi indításához.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Nincs szinkronizálva
 sync.status.lastSync=Utoljára szinkronizálva:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Adatok feltöltése a szinkronizációs szerverre
 sync.status.uploadAccepted=A feltöltés elfogadva — várakozás a szinkronizációs szerverre
 sync.status.syncingFiles=Fájlok szinkronizálása
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB remaining
 sync.storage.filesRemaining=%1$S/%2$S files
 sync.storage.none=None
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Helyi fájl
 sync.storage.remoteFile=Távoli fájl
 sync.storage.savedFile=Mentett fájl
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=A szerver konfigurációja ellenőrizve
 sync.storage.fileSyncSetUp=A fájl szinkronizáció beállítása sikeres.
 sync.storage.openAccountSettings=Felhasználói fiók beállítása
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=A %S szerver nem elérhető.
 sync.storage.error.permissionDeniedAtAddress=Nincs jogosultsága az alábbi címen Zotero könyvtárat létrehozni:
 sync.storage.error.checkFileSyncSettings=Ellenőrizze a fájl szinkronizációs beállításokat vagy forduljon a rendszergazdához.
 sync.storage.error.verificationFailed=A %S szerver ellenőrzése sikertelen. Ellenőrizze a fájl szinkronizációs beállításokat a Zoteto beállítások Szinkronizáció lapján.
 sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Nincs módosítási jogosultsága a '%S' csoporthoz, ezért az új vagy módosított fájlokat nem lehet szinkronizálni a szerverrel.
 sync.storage.error.copyChangedItems=Ha jogosultságot szeretne kérni vagy egy másik csoporttal szinkronizálni, vesse el a szinkronizációt.
 sync.storage.error.fileUploadFailed=A fájl feltöltése sikertelen.
 sync.storage.error.directoryNotFound=A könyvtár nem található
 sync.storage.error.doesNotExist=A %S nem található.
 sync.storage.error.createNow=Létrehozza?
-sync.storage.error.webdav.enterURL=WebDAV URL megadása.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S nem egy érvényes WebDAV URL.
 sync.storage.error.webdav.invalidLogin=A WebDAV szerver nem fogadta el a megadott felhasználói nevet és jelszót.
 sync.storage.error.webdav.permissionDenied=Nincs hozzáférési jogosultsága a WebDAV szerver %S könyvtárához.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL kapcsolódási hiba az %S szerv
 sync.storage.error.webdav.loadURLForMoreInfo=További informáációkért töltse be a WebDAV URL-t a böngészőben.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Betelt a kvóta, ezért néhány fájl nem lett felöltve. A többi Zotero adat szinkronizálása folytatódik.
 sync.storage.error.zfs.personalQuotaReached2=További információk a zotero.org fiók beállítások pontja alatt.
 sync.storage.error.zfs.groupQuotaReached1=Az '%S' csoport kvótája betelt, ezért néhány fájl nem lett felöltve. A többi Zotero adat szinkronizálása folytatódik.
 sync.storage.error.zfs.groupQuotaReached2=A csoport tulajdonosa bővítheti a csoport tárhelyét a zotero.org tárhelybeállítások pontja alatt.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Címke mentése
 sync.longTagFixer.saveTags=Címke mentése
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Could not read text from PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=File not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Close
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(Scanned)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/is-IS/zotero/about.dtd b/chrome/locale/is-IS/zotero/about.dtd
index 452f9cfb24..383d5c9660 100644
--- a/chrome/locale/is-IS/zotero/about.dtd
+++ b/chrome/locale/is-IS/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Sérstakar þakkir:">
 <!ENTITY zotero.about.close "Loka">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/is-IS/zotero/preferences.dtd b/chrome/locale/is-IS/zotero/preferences.dtd
index ec742450fb..fcfb6b0298 100644
--- a/chrome/locale/is-IS/zotero/preferences.dtd
+++ b/chrome/locale/is-IS/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Default:">
 <!ENTITY zotero.preferences.items "items">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Almennt">
 
@@ -59,9 +60,14 @@
 <!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.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.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.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.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">
@@ -70,6 +76,7 @@
 <!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 "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reset...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Flýtihnappar">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Any string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Advanced">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Choose...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
diff --git a/chrome/locale/is-IS/zotero/standalone.dtd b/chrome/locale/is-IS/zotero/standalone.dtd
index f63a223052..e02c6a5a54 100644
--- a/chrome/locale/is-IS/zotero/standalone.dtd
+++ b/chrome/locale/is-IS/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/is-IS/zotero/zotero.dtd b/chrome/locale/is-IS/zotero/zotero.dtd
index f95e2ae35a..f07d2fd038 100644
--- a/chrome/locale/is-IS/zotero/zotero.dtd
+++ b/chrome/locale/is-IS/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Edit">
 <!ENTITY zotero.general.delete "Delete">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!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.">
 <!ENTITY zotero.errorReport.submitted "Your error report has been submitted.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Please post a message to the Zotero forums (forums.zotero.org) with this Report ID, a description of the problem, and any steps necessary to reproduce it.">
 <!ENTITY zotero.errorReport.notReviewed "Error reports are generally not reviewed unless referred to in the forums.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "You have installed a new version of Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Your Zotero database must be upgraded to work with the new version.">
 <!ENTITY zotero.upgrade.autoBackup "Your existing database will be backed up automatically before any changes are made.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Rights">
 <!ENTITY zotero.items.dateAdded_column "Date Added">
 <!ENTITY zotero.items.dateModified_column "Date Modified">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Show in Library">
 <!ENTITY zotero.items.menu.attach.note "Add Note">
@@ -75,8 +93,8 @@
 
 <!ENTITY zotero.toolbar.newItem.label "New Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label "More">
-<!ENTITY zotero.toolbar.newItemFromPage.label "Create New Item from Current Page">
-<!ENTITY zotero.toolbar.lookup.label "Add Item by Identifier">
+<!ENTITY zotero.toolbar.newItemFromPage.label "Create Web Page Item from Current Page">
+<!ENTITY zotero.toolbar.lookup.label "Add Item(s) by Identifier">
 <!ENTITY zotero.toolbar.removeItem.label "Remove Item...">
 <!ENTITY zotero.toolbar.newCollection.label "New Collection...">
 <!ENTITY zotero.toolbar.newGroup "New Group...">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transform Text">
 <!ENTITY zotero.item.textTransform.titlecase "Title Case">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "New Note">
 <!ENTITY zotero.toolbar.note.standalone "New Standalone Note">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Select visible">
 <!ENTITY zotero.tagSelector.clearVisible "Deselect visible">
 <!ENTITY zotero.tagSelector.clearAll "Deselect all">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Rename Tag...">
 <!ENTITY zotero.tagSelector.deleteTag "Delete Tag...">
 
-<!ENTITY zotero.lookup.description "Enter the ISBN, DOI, or PMID to look up in the box below.">
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
+<!ENTITY zotero.lookup.description "Enter one or more ISBNs, DOIs, or PMIDs to look up in the box below.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Select Items">
 <!ENTITY zotero.selectitems.intro.label "Select which items you'd like to add to your library">
@@ -208,6 +235,10 @@
 <!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.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!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/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties
index 3738d5ab02..600f9fa42c 100644
--- a/chrome/locale/is-IS/zotero/zotero.properties
+++ b/chrome/locale/is-IS/zotero/zotero.properties
@@ -14,8 +14,11 @@ general.restartLater=Restart later
 general.restartApp=Restart %S
 general.errorHasOccurred=An error has occurred.
 general.unknownErrorOccurred=An unknown error occurred.
-general.restartFirefox=Please restart %S.
-general.restartFirefoxAndTryAgain=Please restart %S and try again.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
+general.restartFirefox=Please restart Firefox.
+general.restartFirefoxAndTryAgain=Please restart Firefox and try again.
 general.checkForUpdate=Check for update
 general.actionCannotBeUndone=This action cannot be undone.
 general.install=Install
@@ -35,8 +38,12 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -57,7 +64,7 @@ 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 %S to try the upgrade again.
+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...
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Press %S to send an error report to the Zotero develo
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=The Zotero data directory could not be found.
 dataDir.previousDir=Previous directory:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Use %S profile directory
 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?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=New Saved Search
 pane.collections.savedSearchName=Enter a name for this saved search:
 pane.collections.rename=Endurnefnt safn:
 pane.collections.library=Mitt safn
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Trash
 pane.collections.untitled=Enginn titill
 pane.collections.unfiled=Unfiled Items
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=The tag will be removed from all items.
 pane.tagSelector.numSelected.none=0 tög valin
 pane.tagSelector.numSelected.singular=%S tag valið
 pane.tagSelector.numSelected.plural=%S tög valin
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Loading items list...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
 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?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S færslur valdar
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Change Item Type
 pane.item.changeType.text=Are you sure you want to change the item type?\n\nThe following fields will be lost:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S viðhengi:
 pane.item.attachments.count.singular=%S viðhengi:
 pane.item.attachments.count.plural=%S viðhengi:
 pane.item.attachments.select=Veldu skrá
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=click here
-pane.item.tags=Tags:
 pane.item.tags.count.zero=%S tög:
 pane.item.tags.count.singular=%S tag:
 pane.item.tags.count.plural=%S tög:
 pane.item.tags.icon.user=User-added tag
 pane.item.tags.icon.automatic=Automatically added tag
-pane.item.related=Related:
 pane.item.related.count.zero=%S tengt:
 pane.item.related.count.singular=%S tengt:
 pane.item.related.count.plural=%S tengt:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=Vista færslu...
+ingester.scrapingTo=Saving to
 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.
@@ -427,13 +468,14 @@ ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
-db.dbCorrupted.restart=Please restart %S to attempt an automatic restore from the last backup.
+db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
 db.dbCorruptedNoBackup=The Zotero database '%S' appears to have become corrupted, and no automatic backup is available.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
 db.dbRestored=The Zotero database '%1$S' appears to have become corrupted.\n\nYour data was restored from the last automatic backup made on %2$S at %3$S. The damaged file was saved in your Zotero directory.
 db.dbRestoreFailed=The Zotero database '%S' appears to have become corrupted, and an attempt to restore from the last automatic backup failed.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S resolvers found
 zotero.preferences.openurl.resolversFound.singular=%S resolver found
 zotero.preferences.openurl.resolversFound.plural=%S resolvers found
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Rebuild Index
 zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
 zotero.preferences.search.clearIndex=Clear Index
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Any new or modified tra
 zotero.preferences.advanced.resetStyles=Reset Styles
 zotero.preferences.advanced.resetStyles.changesLost=Any new or modified styles will be lost.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
 
@@ -500,7 +559,8 @@ fileInterface.import=Flytja inn
 fileInterface.export=Flytja út
 fileInterface.exportedItems=Flutt út
 fileInterface.imported=Flutt inn
-fileInterface.fileFormatUnsupported=No translator could be found for the given file.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Ónefnd heimildaskrá
 fileInterface.bibliographyHTMLTitle=Heimildaskrá
 fileInterface.importError=An error occurred while trying to import the selected file. Please ensure that the file is valid and try again.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=The items you have selected contain no reference
 fileInterface.bibliographyGenerationError=An error occurred generating your bibliography. Please try again.
 fileInterface.exportError=Villa kom upp við útflutning á valdri skrá.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Advanced search mode — press Enter to search.
 searchInProgress=Leit í gangi, vinsamlegast hinkraðu
 
@@ -613,11 +677,12 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Blank Citation
 integration.emptyCitationWarning.body=The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Error
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Zotero experienced an error updating your document.
 integration.error.mustInsertCitation=You must insert a citation before performing this operation.
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Install style "%1$S" from %2$S?
 styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
 styles.installed=The style "%S" was installed successfully.
-styles.installError=%S does not appear to be a valid style file.
+styles.installError="%S" is not a valid style file.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 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?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancel Sync
 sync.openSyncPreferences=Open Sync Preferences...
 sync.resetGroupAndSync=Reset Group and Sync
@@ -660,18 +733,55 @@ sync.remoteObject=Remote Object
 sync.mergedObject=Merged Object
 
 sync.error.usernameNotSet=Username not set
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Password not set
 sync.error.invalidLogin=Invalid username or password
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 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 %S.
+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 '%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.error.manualInterventionRequired=Conflicts have suspended automatic syncing.
+sync.error.clickSyncIcon=Click the sync icon to resolve them.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Not yet synced
 sync.status.lastSync=Last sync:
@@ -682,9 +792,12 @@ 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.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB remaining
 sync.storage.filesRemaining=%1$S/%2$S files
 sync.storage.none=None
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Local File
 sync.storage.remoteFile=Remote File
 sync.storage.savedFile=Saved File
@@ -692,17 +805,23 @@ sync.storage.serverConfigurationVerified=Server configuration verified
 sync.storage.fileSyncSetUp=File sync is successfully set up.
 sync.storage.openAccountSettings=Open Account Settings
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=The server %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=%S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
 sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=You no longer have file editing access to the Zotero group '%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=%S does not exist.
 sync.storage.error.createNow=Do you want to create it now?
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
 sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1=The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2=The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Save Tag
 sync.longTagFixer.saveTags=Save Tags
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Could not read text from PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=File not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Close
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(Scanned)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/it-IT/zotero/about.dtd b/chrome/locale/it-IT/zotero/about.dtd
index 96a30b109f..103103d3d0 100644
--- a/chrome/locale/it-IT/zotero/about.dtd
+++ b/chrome/locale/it-IT/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Ringraziamenti speciali:">
 <!ENTITY zotero.about.close "Chiudi">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Altri riconoscimenti">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/it-IT/zotero/preferences.dtd b/chrome/locale/it-IT/zotero/preferences.dtd
index d249668010..fa3a7d4192 100644
--- a/chrome/locale/it-IT/zotero/preferences.dtd
+++ b/chrome/locale/it-IT/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Predefinito:">
 <!ENTITY zotero.preferences.items "elementi">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Generale">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Sincronizza gli allegati nella mia libreria con">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Sincronizza gli allegati nelle librerie di gruppo con Zotero storage">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Utilizzando Zotero storage, ne accetti implicitamente le">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "condizioni d'uso">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Sincronizzazione completa con il server Zotero">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Unisci i dati locali di Zotero con i dati dal server, senza tenere conto delle precedenti sincronizzazioni.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Ripristina dal server Zotero">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Erase all server data and overwrite with local Zotero data.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Azzera la cronologia della sincronizzazione file">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Richiedi un controllo di tutti gli allegati locali sul server.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Azzera...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titolo">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Aggiornato">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Scarica ulteriori stili...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Scorciatoie da tastiera">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Qualunque testo">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avanzate">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Trova">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Gestore dei motori di ricerca di articoli">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Sfoglia...">
 <!ENTITY zotero.preferences.dataDir.reveal "Visualizza la cartella dati">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Manutenzione database">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Controlla l&apos;integrità del database">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reimposta motori di ricerca e stili...">
diff --git a/chrome/locale/it-IT/zotero/standalone.dtd b/chrome/locale/it-IT/zotero/standalone.dtd
index 65849ee140..8d8c9af939 100644
--- a/chrome/locale/it-IT/zotero/standalone.dtd
+++ b/chrome/locale/it-IT/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Chiudi">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
diff --git a/chrome/locale/it-IT/zotero/zotero.dtd b/chrome/locale/it-IT/zotero/zotero.dtd
index 6d06114df7..0d2f11eeda 100644
--- a/chrome/locale/it-IT/zotero/zotero.dtd
+++ b/chrome/locale/it-IT/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Modifica">
 <!ENTITY zotero.general.delete "Elimina">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Il log degli errori potrebbe includere messaggi non riferibili a Zotero">
 <!ENTITY zotero.errorReport.submissionInProgress "Attendere, rapporto di errore in fase di invio.">
 <!ENTITY zotero.errorReport.submitted "Il rapporto di errore è stato inviato.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Inviare un messaggio ai forum di Zotero (forums.zotero.org)riportando il numero ID del rapporto di errore, una descrizione del problema ed esponendo i passaggi che hanno condotto all&apos;errore.">
 <!ENTITY zotero.errorReport.notReviewed "In genere, i rapporti di errore non vengono esaminati se non sono stati inviati ai forum.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Nuova versione di Zotero installata correttamente.">
 <!ENTITY zotero.upgrade.upgradeRequired "Il database deve essere aggiornato alla nuova versione di Zotero.">
 <!ENTITY zotero.upgrade.autoBackup "Prima di ogni modifica sarà effettuata un copia di backup del database di Zotero.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Diritti">
 <!ENTITY zotero.items.dateAdded_column "Data di aggiunta">
 <!ENTITY zotero.items.dateModified_column "Data ultima modifica">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Visualizza nella libreria">
 <!ENTITY zotero.items.menu.attach.note "Aggiungi nota">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Modifica testo">
 <!ENTITY zotero.item.textTransform.titlecase "Maiuscolo">
 <!ENTITY zotero.item.textTransform.sentencecase "Maiuscole">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nuovo appunto">
 <!ENTITY zotero.toolbar.note.standalone "Nuova nota">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Seleziona visibili">
 <!ENTITY zotero.tagSelector.clearVisible "Deseleziona visibili">
 <!ENTITY zotero.tagSelector.clearAll "Deseleziona tutto">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Rinomina tag...">
 <!ENTITY zotero.tagSelector.deleteTag "Elimina tag...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Inserisci un ISBN, DOI o PMID da cercare nella casella sotto.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Seleziona elementi">
 <!ENTITY zotero.selectitems.intro.label "Selezionare gli elementi da aggiungere alla propria libreria">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "I tag non selezionati non saranno salvati">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Il tag sarà eliminato da tutti gli oggetti">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Proxy riconosciuto">
 <!ENTITY zotero.proxy.recognized.warning "Aggiungi solo proxy linkati dalla tua biblioteca, scuola o azienda.">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Aggiungere altri proxy può permettere a siti maleintenzionati di camuffarsi da siti fidati.">
diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties
index 9a42b882c7..afc85db069 100644
--- a/chrome/locale/it-IT/zotero/zotero.properties
+++ b/chrome/locale/it-IT/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Riavvia in seguito
 general.restartApp=Restart %S
 general.errorHasOccurred=Si è verificato un errore.
 general.unknownErrorOccurred=Si è verificato un errrore sconosciuto
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Riavviare Firefox
 general.restartFirefoxAndTryAgain=Riavviare Firefox e tentare di nuovo.
 general.checkForUpdate=Controlla aggiornamenti
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Vedi %S per maggiori informazioni
 general.enable=Attiva
 general.disable=Disattiva
 general.remove=Rimuovi
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Apri la documentazione
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Un processo di Zotero è in esecuzione
 general.operationInProgress.waitUntilFinished=Attendere sino al completamento
@@ -57,7 +64,7 @@ upgrade.advanceMessage=Premere '%S' per aggiornare ora
 upgrade.dbUpdateRequired=Il database di Zotero deve essere aggiornato
 upgrade.integrityCheckFailed=Il database di Zotero deve essere riparato prima di poter continuare con l'aggiornamento
 upgrade.loadDBRepairTool=Controlla l&amp;apos;integrità del database
-upgrade.couldNotMigrate=Zotero could not migrate all necessary files.\nPlease close any open attachment files and restart %S to try the upgrade again.
+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=Se si continua a ricevere questo messaggio riavviare il computer.
 
 errorReport.reportError=Report Error...
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Premere '%S' per inviare un rapporto di errore agli s
 errorReport.stepsToReproduce=Passaggio da riprodurre:
 errorReport.expectedResult=Risultato previsto:
 errorReport.actualResult=Risultato verificatosi:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Impossibile trovare la cartella dati di Zotero.
 dataDir.previousDir=Cartella precedente:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Utilizza cartella del profilo di Firefox
 dataDir.selectDir=Selezionare una cartella dati di Zotero
 dataDir.selectedDirNonEmpty.title=Cartella non vuota
 dataDir.selectedDirNonEmpty.text=La cartella selezionata non risulta vuota e non sembra essere una cartella dati di Zotero.\n\nCreare i file di Zotero comunque?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=È stata trovata una libreria di Zotero già esistente
 dataDir.standaloneMigration.description=Sembra essere la prima volta che utilizzi %1$S. Vuoi che %1$S importi le impostazioni da %2$S e usi la cartella dati esistente?
 dataDir.standaloneMigration.multipleProfiles=%1$S condividerà la sua cartella dati con il profilo usato più di recente.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Nuova ricerca salvata
 pane.collections.savedSearchName=Immettere un nome per la ricerca salvata:
 pane.collections.rename=Rinomina collezione:
 pane.collections.library=Libreria personale
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Cestino
 pane.collections.untitled=Senza titolo
 pane.collections.unfiled=Elemento non classificato
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Il tag verrà rimosso da tutti gli elementi.
 pane.tagSelector.numSelected.none=Nessun tag selezionato
 pane.tagSelector.numSelected.singular=%S tag selezionato
 pane.tagSelector.numSelected.plural=%S tag selezionati
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Caricamento lista elementi in corso...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Sposta nel Cestino
 pane.items.trash=Spostare l'elemento selezionato nel Cestino?
 pane.items.trash.multiple=Spostare gli elementi selezionati nel Cestino?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S elementi selezionati
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Modifica tipo di elemento
 pane.item.changeType.text=Modificare il tipo di elemento? I seguenti campi andranno persi:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S allegati
 pane.item.attachments.count.singular=%S allegato
 pane.item.attachments.count.plural=%S allegati
 pane.item.attachments.select=Selezionare file
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=premere qui
-pane.item.tags=Tag:
 pane.item.tags.count.zero=%S tag:
 pane.item.tags.count.singular=%S tag:
 pane.item.tags.count.plural=%S tag:
 pane.item.tags.icon.user=Tag aggiunto manualmente
 pane.item.tags.icon.automatic=Tag aggiunto automaticamente
-pane.item.related=Collegamento:
 pane.item.related.count.zero=%S collegamenti:
 pane.item.related.count.singular=%S collegamento:
 pane.item.related.count.plural=%S collegamenti:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Non è possibile aggiungere file alla coll
 ingester.saveToZotero=Salva in Zotero
 ingester.saveToZoteroUsing=Salva in Zotero utilizzando "%S"
 ingester.scraping=Salvataggio elemento in corso...
+ingester.scrapingTo=Saving to
 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
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=Consenti sempre per questo sito
 
 ingester.importFile.title=Importa File
 ingester.importFile.text=Importare il file "%S"?\n\nElementi saranno aggiunti ad una nuova collezione.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Esecuzione ricerca...
 ingester.lookup.error=Si è verificato un errore di ricerca per questo elemento.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=Non è stato rilevato alcun motore di ricerca
 zotero.preferences.openurl.resolversFound.singular=Rilevato %S motore di ricerca
 zotero.preferences.openurl.resolversFound.plural=Rilevati %S motori di ricerca
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Ricrea indicizzazione
 zotero.preferences.search.rebuildWarning=Ricreare l'intera indicizzazione? L'operazione potrebbe richiedere alcuni minuti.\n Per processare solo gli elementi non indicizzati, selezionare '%S'
 zotero.preferences.search.clearIndex=Azzera indicizzazione
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Tutti i motori di ricer
 zotero.preferences.advanced.resetStyles=Reimposta stili
 zotero.preferences.advanced.resetStyles.changesLost=Tutti gli stili nuovi o modificati andranno persi.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=I seguenti file sono già presenti nella cartella di destinazione e non verranno copiati:
 dragAndDrop.filesNotFound=I seguenti file non sono stati trovati e non verranno copiati:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importa
 fileInterface.export=Esporta
 fileInterface.exportedItems=Elementi esportati
 fileInterface.imported=Importato
-fileInterface.fileFormatUnsupported=Impossibile trovare motori di ricerca per il file scelto.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Bibliografia senza titolo
 fileInterface.bibliographyHTMLTitle=Bibliografia
 fileInterface.importError=Si è verificato un errore durante il tentativo di importazione del file selezionato. Assicurarsi che il file sia valido e ritentare.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=L'elemento selezionato non contiene riferimenti
 fileInterface.bibliographyGenerationError=Si è verificato un errore durante la creazione della bibliografia. Ritentare.
 fileInterface.exportError=Si è verificato un errore durante il tentativo di esportazione del file selezionato.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Premere Invio per avviare la ricerca avanzata
 searchInProgress=Attendere, ricerca in corso.
 
@@ -613,6 +677,7 @@ integration.cited.loading=Caricamento degli elementi citati
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Citazione vuota
 integration.emptyCitationWarning.body=La citazione selezionata risulterebbe vuota nello stile attualmente in uso. Si è certi di volerla aggiungere?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Questa versione del plugin ($INTEGRATION_VERSION) per il programma di video-scrittura non è compatibile con la versione di Zotero installata (%1$S). Aggiornare all'ultima versione disponibile entrambi i componenti.
 integration.error.incompatibleVersion2=Zotero %1$S necessita di %2$S %3$S o successivo. Scaricare l'ultima versione di %2$S da zotero.org.
@@ -643,14 +708,22 @@ integration.citationChanged=La citazione corrente è stata modificata successiva
 integration.citationChanged.description=Selezionando "Sì" verrà impedito a Zotero di aggiornare questa citazione nel caso vengano aggiunte altre citazioni, si cambi stile o si modifichi l'elemento al quale si riferisce. Selezionando "no" verrano persi tutti i cambiamenti.
 integration.citationChanged.edit=La citazione è stata modificata successivamente alla sua creazione da parte di Zotero. Continuando la modifica si perderanno i cambiamenti apportati. Si desidera continuare?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Installare stile "%1$S" da %2$S?
 styles.updateStyle=Aggiornare lo stile esistente "%1$S" con "%2$S" da %3$S?
 styles.installed=Lo stile "%S" è stato installato correttamente.
 styles.installError=%S non sembra essere un file di stile valido.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S si riferisce nel punto %2$S del suo sorgente ad un file CSL non valido o non esistente.
 styles.deleteStyle=Si è certi di voler eliminare lo stile "%1$S"?
 styles.deleteStyles=Si è certi di voler eliminare lo stile selezionato?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Interrompere la Sincronizzazione
 sync.openSyncPreferences=Apri le impostazione di sincronizzazione...
 sync.resetGroupAndSync=Reimpostare i Gruppi e la Sincronizzazione
@@ -660,8 +733,10 @@ sync.remoteObject=Oggetto remoto
 sync.mergedObject=Oggetto unificato
 
 sync.error.usernameNotSet=Nome utente non impostato
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Password non impostata
 sync.error.invalidLogin=Nome utente o password non validi
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Immettere una password.
 sync.error.loginManagerCorrupted1=Zotero non può accedere alle informazioni di login a causa della corruzione del database del gestore di login di %S.
 sync.error.loginManagerCorrupted2=Chiudere %S, fare un copia dei dati e eliminare le informazioni di login.* dal profilo di %S. Immettere nuovamente le proprie informazioni di login per Zotero nel pannello Sincronizzazione delle impostazioni di Zotero.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Se si continua, la propria copia del gruppo verrà a
 sync.error.copyChangedItems=Annullare la sincronizzazione se si desidera avere la possibilità di salvare i propri cambiamenti o di richiedere i privilegi di scrittura da un amministratore del gruppo.
 sync.error.manualInterventionRequired=Una sincronizzazione automatica ha prodotto un conflitto che richiede un intervento manuale.
 sync.error.clickSyncIcon=Fare click sull'icona di sincronizzazione per avviare manualmente la sincronizzazione.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Sincronizzazione non ancora effettuata
 sync.status.lastSync=Ultima sincronizzazione:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Trasferimento dei dati al server di sincronizzazione
 sync.status.uploadAccepted=Trasferimento accettato \u2014 in attesa del server di sincronizzazione
 sync.status.syncingFiles=Sincronizzazione dei file
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB rimanenti
 sync.storage.filesRemaining=%1$S/%2$S file
 sync.storage.none=Nessuno
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=File locale
 sync.storage.remoteFile=File remoto
 sync.storage.savedFile=File salvato
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Configurazione del server verficata
 sync.storage.fileSyncSetUp=Sincronizzazione dei file avviata con successo
 sync.storage.openAccountSettings=Apri le impostazioni dell'account
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Impossibile contattare il server %S
 sync.storage.error.permissionDeniedAtAddress=Autorizzazioni insufficienti per creare una cartella di Zotero nel seguente indirizzo:
 sync.storage.error.checkFileSyncSettings=Controllare le impostazioni di sincronizzazione o contattare l'amministratore del server.
 sync.storage.error.verificationFailed=Verifica di %S non riuscita. Verificare le impostazioni di sincronizzazione nel pannello delle preferenze di Zotero.
 sync.storage.error.fileNotCreated=Non è stato possibile creare il file '%S' nella cartella di immagazzinamento di Zotero.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Non si posseggono più i privilegi di scrittura per il gruppo '%S' di Zotero. I file che sono stati aggiunti o modificati non possono essere sincronizzati con il server.
 sync.storage.error.copyChangedItems=Se si desidera avere la possibilità di copiare in una posizione alternativa gli elementi e i file modificati, annullare ora la sincronizzazione.
 sync.storage.error.fileUploadFailed=Caricamento del file non riuscito
 sync.storage.error.directoryNotFound=Cartella non trovata
 sync.storage.error.doesNotExist=%S non esiste.
 sync.storage.error.createNow=Si desidera crearlo adesso?
-sync.storage.error.webdav.enterURL=Immettere un URL WebDAV valido.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S non è un URL WebDAV valido.
 sync.storage.error.webdav.invalidLogin=Il server WebDAV non ha accettato il nome utente e la password inseriti.
 sync.storage.error.webdav.permissionDenied=Non si hanno i permessi per accedere a %S sul server WebDAV.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=Errore nella connessione SSL a %S
 sync.storage.error.webdav.loadURLForMoreInfo=Apre l'URL WebDAV nel browser per ulteriori informazioni
 sync.storage.error.webdav.seeCertOverrideDocumentation=Consultare la documentazione su sovrapposizione di certificato per maggiori informazioni.
 sync.storage.error.webdav.loadURL=Apre l'URL WebDAV
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Hai raggiunto il tuo limite di spazio massimo consentito per il tuo Zotero File Storage. Alcuni file non sono stati caricati. Gli altri dati di Zotero continueranno a essere sincronizzati con il server.
 sync.storage.error.zfs.personalQuotaReached2=Consulta le impostazioni del tuo account su zotero.org per le opzioni aggiuntive di archiviazione.
 sync.storage.error.zfs.groupQuotaReached1=Il gruppo '%S' ha raggiunto il limite di spazio massimo consentito per il suo Zotero File Storage. Alcuni file non sono stati caricati. Gli altri dati di Zotero continueranno a essere sincronizzati con il server.
 sync.storage.error.zfs.groupQuotaReached2=Il proprietario del gruppo può aumentare lo spazio di archiviazione del gruppo dalle impostazioni di archiviazione su zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Salva Etichetta
 sync.longTagFixer.saveTags=Salva Etichette
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Impossibile leggere il testo del PDF.
 recognizePDF.noMatches=Non è stato possibile trovare riferimenti bibliografici corrispondenti.
 recognizePDF.fileNotFound=Impossibile trovare il file.
 recognizePDF.limit=È stato raggiunto il limite per la ricerca. Provare nuovamente
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Ricezione dei metadati completata. 
 recognizePDF.close.label=Chiudi
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Selezionare una posizione in cui salvare il file formattato
 rtfScan.scannedFileSuffix=(Scansionato)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Ricerca fallita
 lookup.failure.description=Non è stato possibile individuare il record relativo all'identificativo specificato. Controllare l'identificativo e provare nuovamente.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Apri online
 locate.online.tooltip=Vai all'elemento selezionato online
diff --git a/chrome/locale/ja-JP/zotero/about.dtd b/chrome/locale/ja-JP/zotero/about.dtd
index e60e8e5079..7b2152197e 100644
--- a/chrome/locale/ja-JP/zotero/about.dtd
+++ b/chrome/locale/ja-JP/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "次のコミュニティメンバーに謝辞を表します:">
 <!ENTITY zotero.about.close "閉じる">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "その他の貢献者と謝辞">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/ja-JP/zotero/preferences.dtd b/chrome/locale/ja-JP/zotero/preferences.dtd
index 15115f1b4a..87a666be32 100644
--- a/chrome/locale/ja-JP/zotero/preferences.dtd
+++ b/chrome/locale/ja-JP/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "デフォルト:">
 <!ENTITY zotero.preferences.items "アイテム">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "一般">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "マイ・ライブラリーにある添付ファイルを同期するとき右のプログラムを使う:">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Zotero ストレジを利用してグループ・ライブラリの添付ファイルを同期する">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "ファイルの同期について">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Zotero ストレジを使用することにより、次の使用許諾条件に同意することになります。">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "使用許諾条件">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Zoteroサーバと完全に同期（シンク）させる">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "同期の履歴を無視し、ローカル（手元）の Zotero データと同期サーバのデータを融合する。">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Zotero サーバーから復元（リストア）する">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "サーバのデータを全て消去して、ローカル（手元）の Zotero データで上書きする。">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "ファイル同期の履歴を削除する">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "すべてのローカルの添付ファイルに関して、ストレジサーバを強制的に確認する。">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "リセット...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "スタイル名">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "更新日">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "他の引用スタイルを入手する...">
 
 <!ENTITY zotero.preferences.prefpane.keys "ショートカットキー">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - あらゆる文字列">
 
 <!ENTITY zotero.preferences.prefpane.advanced "詳細">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "所在確認">
 <!ENTITY zotero.preferences.locate.locateEngineManager "所在確認エンジンの管理">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "選択する...">
 <!ENTITY zotero.preferences.dataDir.reveal "データ保管ディレクトリを表示する">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "データベースの管理">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "データベースの整合性をチェック">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "サイト・トランスレータと引用スタイルをリセットする...">
diff --git a/chrome/locale/ja-JP/zotero/zotero.dtd b/chrome/locale/ja-JP/zotero/zotero.dtd
index 476d168d2a..29a381550f 100644
--- a/chrome/locale/ja-JP/zotero/zotero.dtd
+++ b/chrome/locale/ja-JP/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "編集">
 <!ENTITY zotero.general.delete "削除">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "エラー・ログは Zotero とは無関係のメッセージを含んでいる可能性があります。">
 <!ENTITY zotero.errorReport.submissionInProgress "エラーレポートが送信されるまでお待ちください。">
 <!ENTITY zotero.errorReport.submitted "エラーレポートが送信されました。">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "このレポート ID、問題の説明、および問題を再現するために必要な手順について、Zotero フォーラム(forums.zotero.org)に投稿して下さい。">
 <!ENTITY zotero.errorReport.notReviewed "エラーレポートはフォーラムで言及されない限り、調査されることはありません。">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Zotero の新しいバージョンがインストールされました。">
 <!ENTITY zotero.upgrade.upgradeRequired "新しいバージョンを使用する前にあなたの Zotero のデータベースを更新する必要があります。">
 <!ENTITY zotero.upgrade.autoBackup "変更が行われる前にデータベースはすべて自動的にバックアップされます。">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "権利">
 <!ENTITY zotero.items.dateAdded_column "追加日時">
 <!ENTITY zotero.items.dateModified_column "更新日時">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "ライブラリの中に表示">
 <!ENTITY zotero.items.menu.attach.note "メモを追加">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "テキストの大文字・小文字を指定する">
 <!ENTITY zotero.item.textTransform.titlecase "各単語の先頭を大文字">
 <!ENTITY zotero.item.textTransform.sentencecase "各文の先頭を大文字">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "新しいメモ">
 <!ENTITY zotero.toolbar.note.standalone "新規メモを独立アイテムとして作成">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "可視タグを選択">
 <!ENTITY zotero.tagSelector.clearVisible "可視タグの選択を解除">
 <!ENTITY zotero.tagSelector.clearAll "選択の解除">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "タグ名の変更...">
 <!ENTITY zotero.tagSelector.deleteTag "タグを削除...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "下のボックスから検索するため ISBN、DOI、または PMID を入力してください。">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "アイテムを選択">
 <!ENTITY zotero.selectitems.intro.label "ライブラリに追加したいアイテムを選択してください">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "チェックされていないタグは保存されません。">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "このタグは全てのアイテムから削除されます。">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "プロキシが認識されました。">
 <!ENTITY zotero.proxy.recognized.warning "あなたの図書館、学校または企業のウェブサイトからリンクされたプロキシのみを追加するようにしてください。">
 <!ENTITY zotero.proxy.recognized.warning.secondary "その他のプロキシを追加すると、悪意あるサイトがあなたの信頼するサイトに成り済ます恐れがあります。">
diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties
index f1d07e5c80..7f19bdb101 100644
--- a/chrome/locale/ja-JP/zotero/zotero.properties
+++ b/chrome/locale/ja-JP/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=後で再起動する
 general.restartApp=%Sを再起動
 general.errorHasOccurred=エラーが発生しました。
 general.unknownErrorOccurred=不明なエラーが発生しました。
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=%S を再起動してください。
 general.restartFirefoxAndTryAgain=%S を再起動してもう一度試してみて下さい。
 general.checkForUpdate=更新の確認
@@ -35,8 +38,12 @@ general.seeForMoreInformation=さらに詳しくは、%S を調べてみてく
 general.enable=有効化
 general.disable=無効化
 general.remove=取り除く
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=ヘルプを開く
 general.numMore=さらに%S個...
+general.openPreferences=Open Preferences
 
 general.operationInProgress=既に Zotero 処理が進行中です。
 general.operationInProgress.waitUntilFinished=完了するまでお待ちください。
@@ -68,6 +75,22 @@ errorReport.advanceMessage=エラーを Zotero 開発者に報告するため、
 errorReport.stepsToReproduce=再現手順:
 errorReport.expectedResult=期待される結果:
 errorReport.actualResult=実際の結果:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Zotero のデータ保存フォルダが見つかりませんでした。
 dataDir.previousDir=前のフォルダ:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Firefox プロファイルのフォルダを使用する
 dataDir.selectDir=Zotero のデータ保存フォルダを選択してください
 dataDir.selectedDirNonEmpty.title=選択されたフォルダは空ではありません
 dataDir.selectedDirNonEmpty.text=選択されたフォルダは空ではなく、Zoteroのデータ保存フォルダではないようです。\n\nこのフォルダにZoteroのファイルを作成してよろしいですか？
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=既存の Zotero ライブラリが見つかりました。
 dataDir.standaloneMigration.description=%1$S をお使いになるのは初めてのようですが、%1$S に %2$S の設定をインポートして、既存のデータ保存フォルダを使用しますか？
 dataDir.standaloneMigration.multipleProfiles=%1$S はそのデータ保存フォルダを最近使用したプロファイルと共有します。
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=新規検索条件の保存
 pane.collections.savedSearchName=この検索条件に名をつけて保存してください:
 pane.collections.rename=コレクション名の変更:
 pane.collections.library=マイ・ライブラリー
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=ゴミ箱
 pane.collections.untitled=無題
 pane.collections.unfiled=未整理のアイテム
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=このタグを削除してよろしいですか
 pane.tagSelector.numSelected.none=タグが選択されていません
 pane.tagSelector.numSelected.singular=%S 個のタグが選択されています
 pane.tagSelector.numSelected.plural=%S 個のタグが選択されています
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=アイテムリストを読み込んでいます...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=ゴミ箱に移動する
 pane.items.trash=選択されたアイテムをゴミ箱に移動してよろしいですか？
 pane.items.trash.multiple=選択されたアイテムをゴミ箱に移動してよろしいですか？
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S 個のアイテムが選択されています
 pane.item.unselected.zero=表示するアイテムがありません
 pane.item.unselected.singular=%S個のアイテムを表示中
 pane.item.unselected.plural=%S個のアイテムを表示中
-pane.item.selectToMerge=統合するアイテムを複数選択
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=アイテムの種類を変更
 pane.item.changeType.text=アイテムの種類を変更してよろしいですか？\n\n以下のフィールドが失われます:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=添付ファイル（%S）:
 pane.item.attachments.count.singular=添付ファイル（%S）:
 pane.item.attachments.count.plural=添付ファイル（%S）:
 pane.item.attachments.select=ファイルを選択
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=ここをクリック
-pane.item.tags=タグ:
 pane.item.tags.count.zero=タグ（%S）:
 pane.item.tags.count.singular=タグ（%S）:
 pane.item.tags.count.plural=タグ（%S）:
 pane.item.tags.icon.user=ユーザの追加したタグ
 pane.item.tags.icon.automatic=自動的に追加されたタグ
-pane.item.related=関連アイテム:
 pane.item.related.count.zero=関連アイテム（%S）:
 pane.item.related.count.singular=関連アイテム（%S）:
 pane.item.related.count.plural=関連アイテム（%S）:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=現在選択中のコレクションへは
 ingester.saveToZotero=Zotero に保存
 ingester.saveToZoteroUsing="%S"を使って Zotero に保存する
 ingester.scraping=アイテムを保存しています...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=アイテムを保存しました
 ingester.scrapeError=アイテムを保存できませんでした
 ingester.scrapeErrorDescription=アイテムの保存中にエラーが発生しました。 さらに詳しくは %S をご確認ください。
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=このサイトについては常に許
 
 ingester.importFile.title=ファイルをインポート
 ingester.importFile.text=ファイル"%S"をインポートしますか？\n\nアイテムは新しいコレクションへと追加されます。
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=所在確認を実行中...
 ingester.lookup.error=このアイテムの所在確認を実行中にエラーが発生しました。
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=可能な場合はPDFや他のファイ
 zotero.preferences.openurl.resolversFound.zero=%S リンク・リゾルバは見つかりませんでした
 zotero.preferences.openurl.resolversFound.singular=%S 個のリンク・リゾルバが見つかりました
 zotero.preferences.openurl.resolversFound.plural=%S個のリンク・リゾルバが見つかりました
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=索引を再作成
 zotero.preferences.search.rebuildWarning=すべての索引を再作成しますか？しばらく時間がかかる可能性があります。\n\nまだ索引されていないアイテムについてだけ索引を作成するには、%S を選択してください。
 zotero.preferences.search.clearIndex=索引の削除
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=新しく追加・変
 zotero.preferences.advanced.resetStyles=スタイルをリセットする
 zotero.preferences.advanced.resetStyles.changesLost=新しく追加・変更されたスタイルは失われます。
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=次のファイルは宛先フォルダにすでに存在しており、コピーされませんでした。:
 dragAndDrop.filesNotFound=次のファイルは見つからなかったため、コピーできませんでした。:
 
@@ -500,7 +559,8 @@ fileInterface.import=インポート
 fileInterface.export=エクスポート
 fileInterface.exportedItems=エクスポートされたアイテム
 fileInterface.imported=インポート済
-fileInterface.fileFormatUnsupported=このファイルのためのトランスレータは見つかりませんでした。
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=無題の参考文献目録
 fileInterface.bibliographyHTMLTitle=参考文献目録
 fileInterface.importError=選択されたファイルのインポート中にエラーが発生しました。ファイルの有効性を確認して、もう一度試してください。
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=選択されたアイテムは文献を含みま
 fileInterface.bibliographyGenerationError=参考文献目録を作成中にエラーが発生しました。再度試してください。
 fileInterface.exportError=選択されたファイルをエクスポート中にエラーが発生しました。
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=詳細検索モード — Enterキーを押すと検索できます。
 searchInProgress=検索しています。しばらくお待ちください。
 
@@ -613,6 +677,7 @@ integration.cited.loading=引用されたアイテムを読み込んでいます
 integration.ibid=ibid
 integration.emptyCitationWarning.title=空白の出典表記
 integration.emptyCitationWarning.body=現在選択中の引用スタイルでは、指定した出典表記は空白になってしまいます。本当にこれを追加してよろしいですか？
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=このバージョンの Zotero ワードプロセッサ・プラグイン ($INTEGRATION_VERSION) は、現在インストールされているバージョンの Zotero (%1$S) と互換性がありません。両方について最新版を使用することをご確認ください。
 integration.error.incompatibleVersion2=Zotero %1$S は %2$S %3$S 以降を必要とします。最新版の %2$S を zotero.org からダウンロードしてください。
@@ -643,14 +708,22 @@ integration.citationChanged=Zotero がこの出典表記を生成してから、
 integration.citationChanged.description="YES"をクリックすると、他の出典表記を追加したり、スタイルを変更したり、該当する文献の書誌情報を修正したりした場合でも、Zotero はこの出典表記を更新しません。"No"をクリックすると変更内容が失われます。
 integration.citationChanged.edit=Zotero がこの出典表記を生成してから、あなたはこれに変更を加えました。編集をするとこの変更内容を消去することになります。続けてもよろしいですか？
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=スタイル"%1$S"を%2$Sからインストールしますか？
 styles.updateStyle=既存のスタイル"%1$S"を、%3$S からの"%2$S"で更新しますか？
 styles.installed=スタイル"%S"が正常にインストールされました。
 styles.installError=%S は有効なスタイル定義ファイルではないようです。
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S は、 %2$S にある不正 CSLファイル、または存在しない CSL ファイルをソースとして参照しています。
 styles.deleteStyle=本当にスタイル "%1$S"を削除してもよろしいですか？
 styles.deleteStyles=本当に選択されたスタイルを削除してもよろしいですか？
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=同期をキャンセル
 sync.openSyncPreferences=同期の環境設定を開く...
 sync.resetGroupAndSync=グループと同期をリセットする
@@ -660,8 +733,10 @@ sync.remoteObject=リモート（サーバ側）のオブジェクト
 sync.mergedObject=統合されたオブジェクト
 
 sync.error.usernameNotSet=ユーザーネームが指定されていません
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=パスワードが指定されていません
 sync.error.invalidLogin=ユーザーネームまたはパスワードが不正です
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=パスワードを入力してください
 sync.error.loginManagerCorrupted1=Zotero はあなたのログイン情報にアクセスすることができません。%S ログイン管理データベースが破損した恐れがあります。
 sync.error.loginManagerCorrupted2=%S を閉じて、あなたの %S プロファイルから、signons.* のバックアップを取り、このファイルを削除してください。それからあなたの Zotero ログイン情報をもう一度 Zotero 環境設定の「同期」タブに入力し直してください。
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=もし続けると、このグループの手元の
 sync.error.copyChangedItems=もしあなたの編集内容を別の場所へコピーしたい、あるいはグループ管理者に書き込みアクセス権限の供与を依頼したい場合は、直ちに同期をキャンセルしてください。
 sync.error.manualInterventionRequired=自動の同期処理は、手動処理が必要な矛盾に陥りました。
 sync.error.clickSyncIcon=手動で同期させるため同期アイコンをクリックしてください。
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=未同期
 sync.status.lastSync=最後の同期:
@@ -682,9 +792,12 @@ sync.status.uploadingData=同期サーバへデータを送信中
 sync.status.uploadAccepted=アップロードが認められました \u2014 同期サーバを待っています
 sync.status.syncingFiles=ファイルを同期しています
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=残り %SKB
 sync.storage.filesRemaining=%1$S/%2$S 個のファイル
 sync.storage.none=なし
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=ローカル（手元）のファイル
 sync.storage.remoteFile=リモート（サーバ側）のファイル
 sync.storage.savedFile=保存されたファイル
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=サーバの設定が検証されまし
 sync.storage.fileSyncSetUp=ファイルの同期の設定に成功しました。
 sync.storage.openAccountSettings=アカウント設定を開く
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=サーバ %S に接続できませんでした。
 sync.storage.error.permissionDeniedAtAddress=以下のアドレスに Zotero データ保存ディレクトリを作る権限がありません:
 sync.storage.error.checkFileSyncSettings=ファイル同期の設定を確認するか、サーバ管理者に連絡してください。
 sync.storage.error.verificationFailed=%S の検証に失敗しました。Zotero 環境設定の同期パネルからファイル同期の設定をご確認ください。
 sync.storage.error.fileNotCreated=ファイル '%S' を Zotero 'ストレジ' ディレクトリ内に作成することができませんでした。
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=あなたはもはや Zotero グループ '%S'に編集アクセス権限を持っていません。あなたが追加したり編集したファイルはサーバ側と同期させることができません。
 sync.storage.error.copyChangedItems=編集されたアイテムやファイルを別の場所へコピーしたい場合は、直ちに同期をキャンセルしてください。
 sync.storage.error.fileUploadFailed=ファイルのアップロードに失敗しました。
 sync.storage.error.directoryNotFound=ディレクトリが見つかりませんでした。
 sync.storage.error.doesNotExist=%S が見つかりません。
 sync.storage.error.createNow=これを今作成してよろしいですか？
-sync.storage.error.webdav.enterURL=WebDAV の URL を入力してください。
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S は正しい WebDAV URL ではありません。
 sync.storage.error.webdav.invalidLogin=WebDAV サーバはユーザーネームとパスワードを拒否しました。
 sync.storage.error.webdav.permissionDenied=WebDAV サーバの %S にアクセスする権限がありません。
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=%S への接続に際しSSL 接続
 sync.storage.error.webdav.loadURLForMoreInfo=さらに詳しい情報を得るには WebDAV URL をブラウザに読み込んでください。
 sync.storage.error.webdav.seeCertOverrideDocumentation=さらに詳しくは証明書上書きのヘルプをご覧下さい。
 sync.storage.error.webdav.loadURL=WebDAV URL を読み込む。
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=あなたの Zotero ファイル・ストレジの容量が一杯になりました。いくつかのファイルはアップロードされませんでした。他の Zotero データはサーバと同期し続けます。
 sync.storage.error.zfs.personalQuotaReached2=保管に関する他の選択肢についてはあなたの zotero.org アカウントの設定をご覧ください。
 sync.storage.error.zfs.groupQuotaReached1=グループ '%S' の Zotero ファイル・ストレジの容量が一杯になりました。いくつかのファイルはアップロードされませんでした。他の Zotero データはサーバ側と同期し続けます。
 sync.storage.error.zfs.groupQuotaReached2=グループのオーナーは zotero.org のストレジ設定からグループの保存容量割り当てを増やすことができます。
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=タグを保存する
 sync.longTagFixer.saveTags=タグを保存する
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=PDF から文字を読み込むことができませ
 recognizePDF.noMatches=該当する文献が見つかりませんでした。
 recognizePDF.fileNotFound=ファイルが見つかりませんでした。
 recognizePDF.limit=クエリー（データベースへの検索要求）の数が上限（query limit）に達しました。しばらくしてからもう一度お試しください。
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=メタデータの取得完了。
 recognizePDF.close.label=閉じる
 
@@ -753,8 +880,21 @@ rtfScan.rtf=リッチテキスト形式 (RTF) (.rtf)
 rtfScan.saveTitle=整形されたファイルの保存先を選んでください。
 rtfScan.scannedFileSuffix=(スキャン済み)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=所在確認が失敗しました。
 lookup.failure.description=Zotero は指定された認識子に該当するレコードを見つけることができませんでした。認識子をもう一度確認してから再度お試しください。
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=オンラインで閲覧する
 locate.online.tooltip=オンラインでこのアイテムを閲覧する
diff --git a/chrome/locale/km/zotero/about.dtd b/chrome/locale/km/zotero/about.dtd
index 7ec3157ef0..e10742708f 100644
--- a/chrome/locale/km/zotero/about.dtd
+++ b/chrome/locale/km/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "ថ្លែងអំណគុណពិសេស:">
 <!ENTITY zotero.about.close "បិទ">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "ទំនួលស្គាល់ និង ថ្លែងអំណគុណ">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/km/zotero/preferences.dtd b/chrome/locale/km/zotero/preferences.dtd
index 43759a92d4..bf903aa31a 100644
--- a/chrome/locale/km/zotero/preferences.dtd
+++ b/chrome/locale/km/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "លំនាំដើម:">
 <!ENTITY zotero.preferences.items "ឯកសារ">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "ទូទៅ">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "គេហទំព័រ:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "ធ្វើសមកាលកម្មឯកសារកម្ជាប់ក្នុងស្វ័យបណ្ណាល័យ">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "ធ្វើសមកាលកម្មមឯកសារភ្ជាប់នៅក្នុងបណ្ណាល័យក្រុមដោយប្រើបន្ទុកហ្ស៊ូតេរ៉ូ">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "តាមរយៈការប្រើបន្ទុកហ្ស៊ូតេរ៉ូ អ្នកត្រូវគោរពទៅតាម">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "លក្ខខណ្ឌ​ និង ខសន្យា។">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "ធ្វើសមកាលកម្មពេញលេញជាមួយម៉ាស៊ីនបម្រើហ្ស៊ូតេរ៉ូ">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "បញ្ចូលទិន្នន័យហ្ស៊ូតេរ៉ូមូលដ្ឋានជាមួយនិងម៉ាស៊ីនបម្រើសមកាលកម្មដោយមិនគិតអំពីប្រវត្តិសមកាលកម្ម។">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "ស្តារឡើងវិញពីម៉ាស៊ីនបម្រើហ្ស៊ូតេរ៉ូ">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "លុបចោលរាល់ទិន្នន័យម៉ាស៊ីនបម្រើទាំងអស់ និង សរសេរលុបពីលើទិន្នន័យ ហ្ស៊ូតេរ៉ូមូលដ្ឋាន">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "កំណត់រៀបចំប្រវត្តិឯកសារសមកាលកម្ម">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "ពិនិត្យដោយហ្មត់ចត់ចំពោះឯកសារភ្ជាប់មូលដ្ឋានទាំងអស់ដែលបានផ្ទុកនៅក្នុងម៉ាស៊ីនបម្រើ">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "កំណត់រៀបចំជាថ្មី...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "ចំណងជើង">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "បានធ្វើទំនើបកម្ម">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "ស៊ីអេសអិល">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "បន្ថែមរចនាបថថ្មី...">
 
 <!ENTITY zotero.preferences.prefpane.keys "ផ្លូវកាត់">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - ខ្សែណាមួយ">
 
 <!ENTITY zotero.preferences.prefpane.advanced "ជាន់ខ្ពស់">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "ទីតាំងឯកសារ">
 <!ENTITY zotero.preferences.locate.locateEngineManager "ម៉ាស៊ីនគ្រប់គ្រងស្វែងរកអត្ថបទ">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "ជ្រើសរើស...">
 <!ENTITY zotero.preferences.dataDir.reveal "បង្ហាញថតទិន្នន័យ">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "ថែរក្សាទិន្នន័យ">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "ពិនិត្យដែនទិន្នន័យ">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "កំណត់កូដចម្លង និង រចនាបថ...">
diff --git a/chrome/locale/km/zotero/standalone.dtd b/chrome/locale/km/zotero/standalone.dtd
index 7b13bbfbd4..1cf5fe3177 100644
--- a/chrome/locale/km/zotero/standalone.dtd
+++ b/chrome/locale/km/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "បិទ">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
diff --git a/chrome/locale/km/zotero/zotero.dtd b/chrome/locale/km/zotero/zotero.dtd
index 65a016c011..93e0188389 100644
--- a/chrome/locale/km/zotero/zotero.dtd
+++ b/chrome/locale/km/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "កែតម្រូវ">
 <!ENTITY zotero.general.delete "លុបចោល">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "កំណត់ហេតុកំហុសអាចបញ្ចូលសារដែលមិនពាក់ព័ន្ធទៅកាន់ហ្ស៊ូតេរ៉ូ។">
 <!ENTITY zotero.errorReport.submissionInProgress "សូមរង់ចាំ ខណៈពេលកំពុងធ្វើរបាយការណ៍អំពីកំហុស។">
 <!ENTITY zotero.errorReport.submitted "កំហុសបានធ្វើរបាយការណ៍រួចហើយ។">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "សូមផ្ញើសារទៅកាន់វេទិកាហ្ស៊ូតេរ៉ូ (forums.zotero.org) ជាមួយនិងអត្ត​លេខរ​បាយការណ៍នេះ ការពណ៌នាបញ្ហា និង ជំហានចាំបាច់នានា ដើម្បី​ផលិត​ឡើងវិញ។">
 <!ENTITY zotero.errorReport.notReviewed "របាយការណ៍អំពីកំហុសមិនត្រូវបានពិនិត្យ លុះត្រាតែឆ្លងកាត់វេទិកានេះ។">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "អ្នកបានដំឡើងហ្ស៊ូតេរ៉ូកំណែថ្មី។">
 <!ENTITY zotero.upgrade.upgradeRequired "អ្នកត្រូវធ្វើទំនើបកម្មទិន្នន័យហ្ស៊ូតេរ៉ូរបស់អ្នកដើម្បីដំណើរការជាមួយកំណែថ្មីនេះ។">
 <!ENTITY zotero.upgrade.autoBackup "ទិន្នន័យឯកសារដែលមានស្រាប់របស់អ្នកនឹងបានរក្សាបម្រុងទុកដោយស្វ័យប្រវត្តិមុនពេលផ្លាស់ប្តូរ។">
@@ -56,7 +58,22 @@
 <!ENTITY zotero.items.rights_column "សិទ្ធិ">
 <!ENTITY zotero.items.dateAdded_column "កាលបរិច្ឆេទបញ្ចូល">
 <!ENTITY zotero.items.dateModified_column "កាលបរិច្ឆេទកែតម្រូវ">
-<!ENTITY zotero.items.numChildren_column "+">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "បង្ហាញនៅក្នុងបណ្ណាល័យ">
 <!ENTITY zotero.items.menu.attach.note "បន្ថែមកំណត់ចំណាំ">
@@ -104,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "បំលែងអត្ថបទ">
 <!ENTITY zotero.item.textTransform.titlecase "ចំណងជើងអក្សរធំ">
 <!ENTITY zotero.item.textTransform.sentencecase "ចំណងជើងអក្សរតូច">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "កំណត់ចំណាំថ្មី">
 <!ENTITY zotero.toolbar.note.standalone "កំណត់ត្រាទោលថ្មី">
@@ -121,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "ជម្រើសមើលឃើញ">
 <!ENTITY zotero.tagSelector.clearVisible "ដោះជម្រើសមើលឃើញ">
 <!ENTITY zotero.tagSelector.clearAll "ដោះជម្រើសទាំងអស់">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "ផ្លាស់ឈ្មោះស្លាក...">
 <!ENTITY zotero.tagSelector.deleteTag "លុបស្លាកចោល...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "សូមបញ្ចូលអាយអេសប៊ីអិន ឌីអូអាយ ឬ ភីអេមអាយឌី ដើម្បីរកមើលនៅក្នុង​ប្រអប់ខាងក្រោមៈ">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "ជ្រើសរើសឯកសារ">
 <!ENTITY zotero.selectitems.intro.label "ជ្រើសរើសឯកសារណាមួយដែលអ្នកចង់បញ្ចូលទៅក្នុងបណ្ណាល័យរបស់អ្នក">
@@ -209,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "ស្លាកដែលគ្មានការពិនិត្យនឹងមិនត្រូវបានទាញមករក្សាទុកទេ។">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "ស្លាកនឹងត្រូវលុបចេញពីគ្រប់ឯកសារទាំងអស់។">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "សិទិ្ធប្រទានបានស្គាល់">
 <!ENTITY zotero.proxy.recognized.warning "គ្រាន់តែបន្ថែមសិទិ្ធប្រទានដែលបានភ្ជាប់ពីគេហទំព័រនៃបណ្ណាល័យ សាលារៀន ឬក៏សាជីវកម្មរបស់អ្នក">
 <!ENTITY zotero.proxy.recognized.warning.secondary "ការបន្ថែមសិទិ្ធប្រទានដទៃទៀតអាចធ្វើឲគេហទំព័រដែលមានវីរុសអាចបន្លំជាគេហទំព័រដែលអ្នកទុកចិត្តបាន។">
diff --git a/chrome/locale/km/zotero/zotero.properties b/chrome/locale/km/zotero/zotero.properties
index 4041cc933d..7318397b89 100644
--- a/chrome/locale/km/zotero/zotero.properties
+++ b/chrome/locale/km/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=ចាប់ផ្តើមជាថ្មីពេលក
 general.restartApp=Restart %S
 general.errorHasOccurred=មានកំហុសកើតឡើង
 general.unknownErrorOccurred=កំហុសមិនដឹងមូលហេតុបានកើតឡើង​។
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=សូមចាប់ផ្តើម %S​ ជាថ្មី។
 general.restartFirefoxAndTryAgain=សូមចាប់ផ្តើម %S​ ជាថ្មី និង ព្យាយាមម្តងទៀត។
 general.checkForUpdate=ស្វែងរកទំនើបកម្ម
@@ -35,8 +38,12 @@ general.seeForMoreInformation=សូមមើល %S សម្រាប់ព័
 general.enable=អាចដំណើរការ
 general.disable=មិនអាចដំណើរការ
 general.remove=លុបចោល
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=បើកឯកសារ
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=ហ្ស៊ូតេរ៉ូកំពុងដំណើរការឥលូវនេះ។
 general.operationInProgress.waitUntilFinished=សូមរង់ចាំរហូតដល់ដំណើរការបានបញ្ចប់។
@@ -68,6 +75,22 @@ errorReport.advanceMessage=សូមចុច %S ដើម្បីបញ្ជ
 errorReport.stepsToReproduce=ជំហានក្នុងការផលិតឡើងវិញៈ
 errorReport.expectedResult=លទ្ធផលដែលបានរំពឹងទុកៈ
 errorReport.actualResult=លទ្ធផលជាក់ស្តែងៈ
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=ថតទិន្នន័យហ្ស៊ូតេរ៉ូមិនអាចរកឃើញ
 dataDir.previousDir=ថតទិន្នន័យពីមុនៈ
@@ -75,6 +98,10 @@ dataDir.useProfileDir=សូមប្រើទម្រង់ថតហ្វៃ
 dataDir.selectDir=សូមជ្រើសរើសថតទិន្នន័យហ្ស៊ូតេរ៉ូមួយ
 dataDir.selectedDirNonEmpty.title=ថតទិន្នន័យមិនត្រូវទទេ
 dataDir.selectedDirNonEmpty.text=ថតទិន្នន័យដែលអ្នកបានជ្រើសរើសមិនត្រូវទទេ ហើយក៏មិនមែនជា​ថតទិន្នន័យហ្ស៊ូតេរ៉ូដែរ។ តើអ្នកចង់បង្កើតឯកសារហ្ស៊ូតេរ៉ូនៅក្នុងថត​ទិន្នន័យនេះដែរឬទេ?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=បានរកឃើញបណ្ណាល័យហ្ស៊ូតេរ៉ូមានស្រាប់
 dataDir.standaloneMigration.description=លក្ខណៈនេះនឹងលេចឡើងនៅពេលអ្នកប្រើ %1$S ជាលើកដំបូង។​ តើអ្នកចង់ឲ %1$S ទាញការរៀបចំពី %2$S ហើយ ប្រើថតទិន្នន័យ​ដែលមានស្រាប់របស់អ្នក?
 dataDir.standaloneMigration.multipleProfiles=%1$S នឹងចែករំលែកថតទិន្នន័យរបស់ខ្លួនជាមួយនិងទម្រង់កម្មវិធីដែលបាន​ប្រើប្រាស់ថ្មីៗបំផុត។
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=ការស្រាវជ្រាវថ្ម
 pane.collections.savedSearchName=ដាក់ឈ្មោះការស្រាវជ្រាវថ្មីដែលបានរក្សាទុក
 pane.collections.rename=ប្តូរឈ្មោះកម្រងឯកសារៈ
 pane.collections.library=ស្វ័យបណ្ណាល័យ
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=ធុងសំរាម
 pane.collections.untitled=ចំណងជើងកម្រងឯកសារ
 pane.collections.unfiled=ឯកសារមិនទាន់បានតម្កល់ទុក
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=តើអ្នកចង់លុបស្លា
 pane.tagSelector.numSelected.none=គ្មានស្លាកត្រូវបានជ្រើសរើស
 pane.tagSelector.numSelected.singular=%S ស្លាកត្រូវបានជ្រើសរើស
 pane.tagSelector.numSelected.plural=%S ស្លាកត្រូវបានជ្រើសរើស
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=កំពុងបង្ហាញបញ្ជីផ្ទុកឯកសារ...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=លុបចូលធុងសំរាម
 pane.items.trash=តើអ្នកចង់លុបឯកសារដែលបានជ្រើសរើសចូលទៅក្នុងធុងសំរាម?
 pane.items.trash.multiple=តើអ្នកចង់លុបឯកសារដែលបានជ្រើសរើសចូលទៅក្នុងធុងសំរាម?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S ឯកសារត្រូវបានជ្រ
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=ផ្លាស់ប្តូរប្រភទឯកសារ
 pane.item.changeType.text=តើអ្នកចង់ផ្លាស់ប្តូរប្រភេទឯកសារ? វិស័យទាំងអស់នេះនឹងត្រូវបាត់បង់ៈ
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S ឯកសារកម្ជាប់:
 pane.item.attachments.count.singular=%S ឯកសារកម្ជាប់:
 pane.item.attachments.count.plural=%S ឯកសារកម្ជាប់:
 pane.item.attachments.select=ជ្រើសរើសឯកសារ
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=សូមចុចត្រង់នេះ
-pane.item.tags=ស្លាក:
 pane.item.tags.count.zero=%S ស្លាក:
 pane.item.tags.count.singular=%S ស្លាក:
 pane.item.tags.count.plural=%S ស្លាក:
 pane.item.tags.icon.user=ស្លាកភ្ជាប់អ្នកប្រើប្រាស់
 pane.item.tags.icon.automatic=ស្លាកភ្ជាប់ស្វ័យប្រវត្តិ
-pane.item.related=ពាក់ព័ន្ធ:
 pane.item.related.count.zero=%S ពាក់ព័ន្ធ:
 pane.item.related.count.singular=%S ពាក់ព័ន្ធ:
 pane.item.related.count.plural=%S ពាក់ព័ន្ធ:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=អ្នកមិនអាចបន្ថ
 ingester.saveToZotero=ទាញឯកសាររក្សាទុកក្នុងហ្ស៊ូតេរ៉ូ
 ingester.saveToZoteroUsing=ទាញឯកសាររក្សាទុកក្នុងហ្ស៊ូតេរ៉ូតាមរយៈ "%S"
 ingester.scraping=កំពុងទាញឯកសាររក្សាទុក...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=ឯកសារត្រូវបានទាញរក្សាទុក
 ingester.scrapeError=មិនអាចទាញឯកសាររក្សាទុកបាន
 ingester.scrapeErrorDescription=កំហុសបានកើតឡើង ខណៈពេលទាញឯកសារនេះមករក្សាទុក។​ សូមមើល %S សម្រាប់ព័ត៌បន្ថែម។
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=ជានិច្ចកាល ត្រ
 
 ingester.importFile.title=នាំឯកសារចូល
 ingester.importFile.text=តើអ្នកចង់នាំឯកសារ "%S" ចូលឬ? ឯកសារនេះនឹងបញ្ចូលទៅក្នុងកម្រងថ្មី។
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=ធ្វើការស្វែងរក…
 ingester.lookup.error=មានកំហុសកើតឡើង ខណៈពេលធ្វើការស្វែងរកឯកសារនេះ។
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S ដំណោះស្រាយត្រូវបានរកឃើញ
 zotero.preferences.openurl.resolversFound.singular=%S ដំណោះស្រាយត្រូវបានរកឃើញ
 zotero.preferences.openurl.resolversFound.plural=%S ដំណោះស្រាយត្រូវបានរកឃើញ
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=បង្កើតលិបិក្រមជាថ្មី
 zotero.preferences.search.rebuildWarning=តើអ្នកចង់ស្តារលិបិក្រមឡើងវិញទាំងមូល? ដំណើរការនេះអាចចំណាយ​ពេលមួយរយៈ។ \n\n ដាក់លិបិក្រមទៅលើឯកសារណាដែលមិនទាន់​ដាក់លិបិក្រមប៉ុណ្ណោះដោយប្រើ %S។
 zotero.preferences.search.clearIndex=សម្អាតលិបិក្រម
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=កូដចម្ល
 zotero.preferences.advanced.resetStyles=រៀបចំរចនាបថ
 zotero.preferences.advanced.resetStyles.changesLost=រចនាបថថ្មី​ ឬ រចនាបថដែលបានកែតម្រូវនឹងត្រូវបាត់បង់។
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=ឯកសារដូចខាងក្រោមមានរួចរាល់ហើយនៅក្នុងថតទិសដៅ និង​ មិនទាន់បានចម្លងទុកទេ។
 dragAndDrop.filesNotFound=ឯកសារដូចខាងក្រោមនេះមិនត្រូវបានរកឃើញ ហើយក៏មិនអាចថតចម្លង​បានដែរ។
 
@@ -500,7 +559,8 @@ fileInterface.import=នាំចូល
 fileInterface.export=នាំចេញ
 fileInterface.exportedItems=ឯកសារនាំចេញ
 fileInterface.imported=បាននាំចូល
-fileInterface.fileFormatUnsupported=មិនអាចរកឃើញកូដចម្លងចំពោះឯកសារដែលផ្តល់មក
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=គន្ថនិទេ្ទសគ្មានចំណងជើង
 fileInterface.bibliographyHTMLTitle=គន្ថនិទេ្ទស
 fileInterface.importError=មានកំហុសបានកើតឡើងខណៈពេលដែលព្យាយាមនាំចូលឯកសារដែលបានជ្រើសរើស។ សូមបញ្ជាក់ថា លុះត្រាតែឯកសារមានសុពល​ភាព​ និង ព្យាយាមម្តងទៀត។
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=ឯកសារដែលអ្នកបានជ
 fileInterface.bibliographyGenerationError=មានកំហុសកើតឡើងខណៈពេលបង្កើតគន្ថនិទេ្ទស។ សូមព្យាយាមជាថ្មី។
 fileInterface.exportError=មានកំហុសកើតឡើងខណៈពេលដែលព្យាយាមទាញចេញនូវឯកសារដែលបានជ្រើសរើស។
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=របៀបស្វែងរកលឿន សូមចុចសញ្ញាបញ្ចូលដើម្បីស្រាវជ្រាវ។
 searchInProgress=សូមរងចាំ ខណៈពេលការស្រាវជាវកំពុងដំណើរការ។
 
@@ -613,6 +677,7 @@ integration.cited.loading=កំពុងបង្ហាញបន្ទុកឯ
 integration.ibid=ដូចខាងលើ
 integration.emptyCitationWarning.title=គ្មានអាគតដ្ឋាន
 integration.emptyCitationWarning.body=អាគតដ្ឋានដែលអ្នកបានគូសបញ្ជាក់គឺអត់មាននៅក្នុងរចនាបថដែលបានជ្រើសរើស។ តើអ្នកចង់បន្ថែមវាទេ?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=កំណែថ្មីនៃកម្មវិធីជំនួយវាយអត្ថបទហ្ស៊ូតេរ៉ូនេះ (កំណែថ្មីបញ្ចូលរួមគ្នា) គឺមានវិសមិតភាពទៅនឹងហ្ស៊ូតេរ៉ូកម្ជាប់នឹងហ្វៃអ៊ើហ្វក់ស៍ (%1$S) ដែល​បាន​ដំឡើងនៅក្នុងកំព្យូទ័ររបស់អ្នកទេ។ សូមបញ្ជាក់ថា អ្នកត្រូវប្រើកំណែ​ថ្មីបំផុតនៃសមាសភាពទាំងពីរ។
 integration.error.incompatibleVersion2=ហ្ស៊ូតេរ៉ូ %1$S តម្រូវឲប្រើកំណែថ្មី %2$S %3$S ឬ ទំនើបជាងនេះ។ សូមទាញយកកំណែថ្មីបំផុត %2$S ពីគេហទំព័រ zotero.org ។
@@ -643,14 +708,22 @@ integration.citationChanged=អ្នកបានកែតម្រូវអា
 integration.citationChanged.description=សូមចុច "បាទ"​ ដើម្បីកុំឲហ្ស៊ូតេរ៉ូធ្វើទំនើបកម្មអាគតដ្ឋាននេះ ទោះបីជា​អ្នកដាក់អាគតដ្ឋានថ្មី ប្តូររចនាបថ ឬក៏កែកំណត់យោងចំពោះអត្ថបទ។ សូមចុច "ទេ" ដើម្បីលុបរាល់ការផ្លាស់ប្តូរទាំងអស់។
 integration.citationChanged.edit=អ្នកបានកែតម្រូវអាគតដ្ឋាននេះតាំងពីហ្ស៊ូតេរ៉ូបានបង្កើតមកម្លេះ។ កំណែ​តម្រូវនឹងលុបចោលរាល់ការផ្លាស់ប្តូរទាំងអស់។ តើអ្នកចង់បន្តទៅ​មុខ​ទៀតទេ?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=ដំឡើងរចនាបថ "%1$S" ពី %2$S?
 styles.updateStyle=ធ្វើទំនើបកម្មរចនាបថដែលមានស្រាប់ "%1$S"ជាមួយ "%2$S" ពី %3$S?
 styles.installed=រចនាបថ "%S" ត្រូវបានដំឡើងដោយជោគជ័យ។
 styles.installError=%S មិនមែនជារចនាបថមានសុពលភាពទេ។
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=យោង %1$S ជាសំណុំឯកសារស៊ីអេសអិល ដែលគ្មានសុពលបានមកពី %2$S ។
 styles.deleteStyle=តើអ្នកចង់លុបរចនាបថ "%1$S"?
 styles.deleteStyles=តើអ្នកចង់លុបរចនាបថជ្រើសរើស?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=បដិសេធសមកាលកម្ម
 sync.openSyncPreferences=បើកជម្រើសអាទិភាពសមកាលកម្ម...
 sync.resetGroupAndSync=កំណត់រៀបចំក្រុម និង សមកាលកម្ម
@@ -660,8 +733,10 @@ sync.remoteObject=វត្ថុឆ្ងាយ
 sync.mergedObject=វត្ថុរួម
 
 sync.error.usernameNotSet=មិនបានដាក់ឈ្មោះអ្នកប្រើ
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=មិនបានដាក់លេខសម្ងាត់
 sync.error.invalidLogin=ឈ្មោះអ្នកប្រើ ឬ លេខសម្ងាត់គ្មានសុពលភាព
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=សូមបញ្ចូលលេខសម្ងាត់
 sync.error.loginManagerCorrupted1=ហ្ស៊ូតេរ៉ូមិនអាចបញ្ចូលព័ត៌មានរបស់អ្នកបានទេ។ នេះអាចបណ្តាលមកពី​ទិន្នន័យ​គ្រប់គ្រងព័តិមានបញ្ចូល %S បានខូច។
 sync.error.loginManagerCorrupted2=សូមបិទ%S ការទាញរក្សាបម្រុងទុក និង លុបព័តិមានចូលមើលពីទម្រង់ %S របស់អ្នក និង​បញ្ចូលព័ត៌ជាថ្មីនៅត្រង់ផ្ទាំងសមកាលកម្មក្នុងជម្រើស​អាទិភាពហ្ស៊ូតេរ៉ូ។
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=ប្រសិនបើអ្នកបន្ត ឯ
 sync.error.copyChangedItems=ប្រសិនបើអ្នកចង់បានឱកាសថតចម្លងរាល់ការផ្លាស់ប្តូររបស់អ្នក ឬ ស្នើសុំ​សិទ្ធិចូលមើលពីក្រុមរដ្ឋបាល។ សូមបដិសេធសមកាលកម្មចោល។
 sync.error.manualInterventionRequired=សមកាលកម្មដោយស្វ័យប្រវត្តិបណ្តាលឲមានការប៉ះទង្គិចគ្នា តម្រូវឲធ្វើសម​កាល​កម្មដោយដៃ។
 sync.error.clickSyncIcon=សូមចុចលើនិម្មិតសញ្ញា ដើម្បីធ្វើសមកាលកម្មដោយដៃ។
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=មិនទាន់បានធ្វើសមកាលកម្ម
 sync.status.lastSync=ធ្វើសមកាលកម្មលើកចុងក្រោយ:
@@ -682,9 +792,12 @@ sync.status.uploadingData=ផ្ទុកទិន្នន័យចូលម៉
 sync.status.uploadAccepted=ទិន្នន័យផ្ទុកឡើងត្រូវបានទទួល​ \u2014 ដោយរង់ចាំម៉ាស៊ីនបម្រើសមកាល​កម្ម។
 sync.status.syncingFiles=កំពុងធ្វើសមកាលកម្មឯកសារ
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB កំពុងនៅសល់
 sync.storage.filesRemaining=ឯកសារ %1$S/%2$S
 sync.storage.none=គ្មាន
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=ឯកសារមូលដ្ឋាន
 sync.storage.remoteFile=ឯកសារចម្ងាយ
 sync.storage.savedFile=ឯកសារបានទាញរក្សាទុក
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=ការកំណត់រចនាស
 sync.storage.fileSyncSetUp=ការកំណត់រចនាសម្ព័ន្ធម៉ាស៊ីនបម្រើសមកាលកម្មទទួលបានជោគជ័យ។
 sync.storage.openAccountSettings=ការរៀបចំគណនីចំហ
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=ម៉ាស៊ីនបម្រើ %S​ មិនអាចចូលបានទេ។
 sync.storage.error.permissionDeniedAtAddress=អ្នកពុំមានសិទ្ធិបង្កើតថតក្នុងហ្ស៊ូតេរ៉ូតាមអាសយដ្ឋានដូចខាងក្រោម:
 sync.storage.error.checkFileSyncSettings=សូមពិនិត្យមើលការរៀបចំឯកសារសមកាលកម្មរបស់អ្នក ឬ ទាក់ទងជាមួយ​រដ្ឋបាល​ម៉ាស៊ីន​បម្រើរបស់អ្នក។
 sync.storage.error.verificationFailed=ការផ្ទៀងផ្ទាត់ %S ទទួលបានបរាជ័យ។ ផ្ទៀងផ្ទាត់ការរៀបចំឯកសារសម កាលកម្មនៅក្នុងផ្ទាំងសមកាលកម្មនៃជម្រើសនានារបស់ហ្ស៊ូតេរ៉ូ។
 sync.storage.error.fileNotCreated=ឯកសារ '%S' មិនអាចបង្កើតនៅក្នងថតផ្ទុកហ្ស៊ូតេរ៉ូ។
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=អ្នកលែងមានសិទ្ធិចូលកែតម្រូវឯកសារក្នុងក្រុមហ្ស៊ូតេរ៉ូ '%S' ហើយ ឯកសារដែលអ្នកបានបន្ថែម​ ឬ បានកែតម្រូវមិនអាចធ្វើសមកាលកម្ម ទៅដល់ម៉ាស៊ីនបម្រើនោះទេ។
 sync.storage.error.copyChangedItems=ប្រសិនបើ អ្នកចង់បានឱកាសថតចម្លងឯកសារដែលបានកែតម្រូវទៅកន្លែង ផ្សេងទៀត។ សូមធ្វើការបដិសេធសមកាលកម្មឥលូវនេះ។
 sync.storage.error.fileUploadFailed=ឯកសារផ្ទុកឡើងបានបរាជ័យ។
 sync.storage.error.directoryNotFound=ថតរកមិនឃើញ
 sync.storage.error.doesNotExist=%S អត់មានកើតឡើង
 sync.storage.error.createNow=តើអ្នកចង់បង្កើតវាឥលូវនេះទេ?
-sync.storage.error.webdav.enterURL=សូមបញ្វូល WebDAV URL។
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S មិនមែនជា WebDAV URL មានសុពលភាពទេ។
 sync.storage.error.webdav.invalidLogin=ម៉ាស៊ីនបម្រើ WebDAV មិនទទូលឈ្មោះអ្នកប្រើ និង លេខសម្ងាត់ ដែលអ្នក​បានបញ្ចូលនោះទេ។
 sync.storage.error.webdav.permissionDenied=អ្នកអត់មានការអនុញ្ញាតឲចូលទៅកាន់ %S នៅលើម៉ាស៊ីនបម្រើ WebDAV​ទេ។
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=ការភ្ជាប់អេ
 sync.storage.error.webdav.loadURLForMoreInfo=ផ្ទុក WebDAV URL របស់អ្នកនៅក្នុងកម្មរុករកសម្រាប់ព័ត៌មានបន្ថែម។
 sync.storage.error.webdav.seeCertOverrideDocumentation=សូមមើលវិញ្ញាបនប័ត្រលុបចោលឯកសារសម្រាប់ព័តិមានបន្ថែម។
 sync.storage.error.webdav.loadURL=ផ្ទុក WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=ឯកសាររបស់អ្នកដែលបានផ្ទុកក្នុងហ្ស៊ូតេរ៉ូបានដល់បរិមាណកំណត់។ ឯកសារមួយចំនួនលែងផ្ទុកឡើងបានទៀត។ ទិន្នន័យផ្សេងៗទៀតនៃ ហ្ស៊ូតេរ៉ូនឹងបន្តធ្វើសមកាលកម្មទៅកាន់ម៉ាស៊ីនបម្រើ។
 sync.storage.error.zfs.personalQuotaReached2=សូមមើលការកំណត់គណនីរបស់អ្នកសម្រាប់ជម្រើសការផ្ទុកឯកសារបន្ថែមនៅក្នុង zotero.org ។
 sync.storage.error.zfs.groupQuotaReached1=ក្រុម '%S' បានដល់បរិមាណកំណត់នៅក្នុងហ្ស៊ូតេរ៉ូ។ ឯកសារមួយចំនួន​លែងផ្ទុកឡើងបានទៀត។ ទិន្នន័យផ្សេងៗទៀតនៃហ្ស៊ូតេរ៉ូនឹងបន្តធ្វើសម​កាលកម្មទៅកាន់ម៉ាស៊ីនបម្រើ។
 sync.storage.error.zfs.groupQuotaReached2=ម្ចាស់ក្រុមអាចបង្កើនសមត្ថភាពផ្ទុករបស់ក្រុមនៅក្នុងផ្នែករៀបចំកំណត់បរិមាណផ្ទុកនៅក្នុង zotero.org ។
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=ទាញរក្សាទុកស្លាក
 sync.longTagFixer.saveTags=ទាញរក្សាទុកស្លាក
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=មិនអាចស្គាល់អត្ថបទ
 recognizePDF.noMatches=ឯកសារផ្គូរផ្គងមិនអាចរកឃើញ។
 recognizePDF.fileNotFound=ឯកសាររកមិនឃើញ។
 recognizePDF.limit=ការសាកសូរមានកំណត់ សូមព្យាយាមម្តងទៀត។
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=ទិន្នន័យមេតាបានទទួលដោយពេញលេញ។
 recognizePDF.close.label=បិទ
 
@@ -753,8 +880,21 @@ rtfScan.rtf=ទ្រុងទ្រាយទម្រង់ Rich Text Format (.
 rtfScan.saveTitle=ជ្រើសរើសទីតាំងដែលត្រូវរកសាទុកឯកសារដែលបានទ្រង់ទ្រាយរួចហើយ
 rtfScan.scannedFileSuffix=(បានវិភាគរួចហើយ)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=ការស្វែងរកបានបរាជ័យ
 lookup.failure.description=ហ្ស៊ូតេរ៉ូមិនអាចរកឃើញកំណត់ត្រាណាមួយទៅតាមអត្តសញ្ញាណកម្មដែលបានបញ្ជាក់នោះទេ។ សូមផ្ទៀងផ្ទាត់នូវអត្តសញ្ញាណ ហើយ ព្យាយាមម្តង​ទៀត។
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=មើលគេហទំព័រ
 locate.online.tooltip=ចូលមើលឯកសារនេះនៅលើគេហទំព័រ
diff --git a/chrome/locale/ko-KR/zotero/about.dtd b/chrome/locale/ko-KR/zotero/about.dtd
index 3f3d3d1293..f158962617 100644
--- a/chrome/locale/ko-KR/zotero/about.dtd
+++ b/chrome/locale/ko-KR/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "감사드릴 분들:">
 <!ENTITY zotero.about.close "닫기">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Zotero 프로젝트에 기여한 분들">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/ko-KR/zotero/preferences.dtd b/chrome/locale/ko-KR/zotero/preferences.dtd
index 3e2f49ffa7..baab74db50 100644
--- a/chrome/locale/ko-KR/zotero/preferences.dtd
+++ b/chrome/locale/ko-KR/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "기본값:">
 <!ENTITY zotero.preferences.items "항목">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "일반">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "내 라이브러리 첨부파일 동기화 도구 : ">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Zotero 저장소를 사용해 그룹 라이브러리내 첨부 파일을 동기화">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Zotero 스토리지 이용시 다음 사항에 동의하는 것임 : ">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "이용 약관">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Zotero 서버와 전체 동기화">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Zotero의 로컬 데이터와 동기화 서버 데이터 병합. 동기화 히스토리 무시함.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Zotero 서버로부터 복원">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "모든 서버 자료를 지우고 지역 Zotero 자료로 덮어 씁니다.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "파일 동기화 기록 재설정">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "모든 지역 첨부 파일을 위해 저장서버의 검사를 강제합니다.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "재설정...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "제목">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "업데이트됨">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "추가 스타일 받기...">
 
 <!ENTITY zotero.preferences.prefpane.keys "단축키">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - 문자열">
 
 <!ENTITY zotero.preferences.prefpane.advanced "고급">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "위치">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article 검색 엔진 메니저">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "선택...">
 <!ENTITY zotero.preferences.dataDir.reveal "자료 디렉토리 표시">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "데이터베이스 유지">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "데이터베이스 무결성 점검">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "중계기 및 스타일 재설정...">
diff --git a/chrome/locale/ko-KR/zotero/standalone.dtd b/chrome/locale/ko-KR/zotero/standalone.dtd
index e9fbb136c1..a2bdc69e78 100644
--- a/chrome/locale/ko-KR/zotero/standalone.dtd
+++ b/chrome/locale/ko-KR/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "닫기">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
diff --git a/chrome/locale/ko-KR/zotero/zotero.dtd b/chrome/locale/ko-KR/zotero/zotero.dtd
index 5aef1ced3e..818a63a9ff 100644
--- a/chrome/locale/ko-KR/zotero/zotero.dtd
+++ b/chrome/locale/ko-KR/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "편집">
 <!ENTITY zotero.general.delete "삭제">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "오류 로그에는 Zotero와 관련이 없는 메시지가 포함될 수 있습니다.">
 <!ENTITY zotero.errorReport.submissionInProgress "오류 보고가 제출되는 동안 기다려 주세요.">
 <!ENTITY zotero.errorReport.submitted "오류 보고가 제출되었습니다.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Zotero 포럼(forums.zotero.org)에 보고서 ID, 문제 설명, 및 그것을 재연하는데 필요한 순서와 함께 메시지를 게시해주시기 바랍니다.">
 <!ENTITY zotero.errorReport.notReviewed "오류 보고서는 일반적으로 포럼내에서 언급하지 않는 한 재검토하지 않습니다.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "새 버전의 Zotero를 설치했습니다.">
 <!ENTITY zotero.upgrade.upgradeRequired "Zotero 데이터베이스는 반드시 새 버전으로 작업하기 위해 업그레이드 해야 합니다.">
 <!ENTITY zotero.upgrade.autoBackup "현재의 데이터베이스는 어떤한 변경을 하기 전에 자동으로 백업을 할 겁니다.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "권리">
 <!ENTITY zotero.items.dateAdded_column "입력일">
 <!ENTITY zotero.items.dateModified_column "변경일">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "라이브러리로 표시">
 <!ENTITY zotero.items.menu.attach.note "노트 추가">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "글자 변형">
 <!ENTITY zotero.item.textTransform.titlecase "글차 첫머리는 대문자">
 <!ENTITY zotero.item.textTransform.sentencecase "문장 첫머리는 대문자">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "새 노트">
 <!ENTITY zotero.toolbar.note.standalone "새로운 독립 노트">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "보이는 것들 선택">
 <!ENTITY zotero.tagSelector.clearVisible "보이는 것들 선택 해제">
 <!ENTITY zotero.tagSelector.clearAll "선택 모두 해제">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "태그 이름 변경...">
 <!ENTITY zotero.tagSelector.deleteTag "태그 지우기...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "ISBN, DOI, 또는 PMID를 입력하세요.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "항목 선택">
 <!ENTITY zotero.selectitems.intro.label "라이브러리에 추가하고 싶은 항목 선택">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "체크되지 않은 태그는 저장되지 않습니다.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "해당 태그가 모든 항목으로부터 삭제됩니다.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "프록시 인식완료">
 <!ENTITY zotero.proxy.recognized.warning "귀하의 도서관 · 학교 · 회사의 웹사이트에 연결된 프록시만 추가하십시오.">
 <!ENTITY zotero.proxy.recognized.warning.secondary "다른 프록시들을 연결하면, 악성 사이트들이 신뢰가능 사이트처럼 보이게 됩니다.">
diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties
index 62ec9a4c93..c0c5e0ca6e 100644
--- a/chrome/locale/ko-KR/zotero/zotero.properties
+++ b/chrome/locale/ko-KR/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=다음에 재시작
 general.restartApp=Restart %S
 general.errorHasOccurred=오류가 발생했습니다.
 general.unknownErrorOccurred=알 수없는 오류가 발생했습니다.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Firefox를 재시작해 주세요.
 general.restartFirefoxAndTryAgain=Firefox를 재시작한 후 다시 시도해 주세요.
 general.checkForUpdate=업데이트 확인
@@ -35,8 +38,12 @@ general.seeForMoreInformation=자세한 것은 $S(을)를 참조하세요.
 general.enable=사용
 general.disable=사용안함
 general.remove=제거
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=도움말 열기
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Zotero 작업이 현재 진행중입니다.
 general.operationInProgress.waitUntilFinished=끝날때까지 기다려주세요.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=%S (을)를 눌러 Zotero 개발자들에게 오류 
 errorReport.stepsToReproduce=재현 방법:
 errorReport.expectedResult=예상 결과:
 errorReport.actualResult=실제 결과:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Zotero 데이터 디렉토리를 찾을 수 없습니다.
 dataDir.previousDir=이전 디렉토리:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Firefox 프로필 디렉토리 사용
 dataDir.selectDir=Zotero 데이터 디렉토리 선택
 dataDir.selectedDirNonEmpty.title=디렉토리 비어있지 않음
 dataDir.selectedDirNonEmpty.text=선택한 디렉토리는 비어 있지 않고 Zotero 데이터 디렉토리인 것처럼 보이지 않습니다.\n\n이 디렉토리 안에 Zotero 파일을 어떻게든 생성하겠습니까?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Zotero 라이브러리 찾음
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=새 저장된 검색내용
 pane.collections.savedSearchName=저장된 검색내용의 이름 입력:
 pane.collections.rename=컬렉션 이름 변경:
 pane.collections.library=내 라이브러리
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=휴지통
 pane.collections.untitled=제목없음
 pane.collections.unfiled=미분류 항목
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=모든 항목에서 태그를 지웁니다.
 pane.tagSelector.numSelected.none=0개의 태그 선택
 pane.tagSelector.numSelected.singular=%S개의 태그 선택
 pane.tagSelector.numSelected.plural=%S개의 태그 선택
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=항목 목록 불러오기...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=휴지통으로 이동
 pane.items.trash=선택한 항목을 휴지통으로 보내길 원하는 것이 확실합니까?
 pane.items.trash.multiple=선택한 항목들을 휴지통으로 보내길 원하는 것이 확실합니까?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%s개의 아이템이 선택되었습니다
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=항목 형식 변경
 pane.item.changeType.text=정말로 항목 형식을 변경하길 원하십니까?\n\n다음 필드들을 잃을 수 도 있습니다.
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S 첨부:
 pane.item.attachments.count.singular=%s 첨부
 pane.item.attachments.count.plural=%s 첨부
 pane.item.attachments.select=파일 선택
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=여기를 누르세요
-pane.item.tags=태그:
 pane.item.tags.count.zero=%S 태그:
 pane.item.tags.count.singular=%s 태그
 pane.item.tags.count.plural=%s 태그
 pane.item.tags.icon.user=사용자 추가 태그
 pane.item.tags.icon.automatic=자동 추가 태그
-pane.item.related=관련됨:
 pane.item.related.count.zero=%S개 관련됨:
 pane.item.related.count.singular=%S개 관련됨:
 pane.item.related.count.plural=%S개 관련됨:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=현재 선택된 컬렉션에 파일을 
 ingester.saveToZotero=Zotero로 저장
 ingester.saveToZoteroUsing="%S"를 사용하여 Zotero로 저장
 ingester.scraping=항목 저장...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=항목 저장됨.
 ingester.scrapeError=항목을 저장할 수 없습니다.
 ingester.scrapeErrorDescription=항목 저장중 오류가 발생했습니다. 더 많은 정보를 원하면 %S를(을) 확인하세요.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=이 사이트에 대해 항상 허용함
 
 ingester.importFile.title=파일 불러오기
 ingester.importFile.text="%S"?\n\nItems 파일을 불러들여 새로운 컬렉션에 저장할까요?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=찾기 실행중...
 ingester.lookup.error=항목 찾기를 실행 중 오류가 발생했습니다.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S개의 해독기 발견
 zotero.preferences.openurl.resolversFound.singular=%S개의 해독기 발견
 zotero.preferences.openurl.resolversFound.plural=%S개의 해독기 발견
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=색인 재구축
 zotero.preferences.search.rebuildWarning=전체 색인을 재구축하고 싶습니까? 이것은 시간이 걸릴지 모릅니다\n\n색인이 붙지 않은 항목에만 색인을 붙이기 위해, %S 사용.
 zotero.preferences.search.clearIndex=색인 제거
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=모든 신규 또는 
 zotero.preferences.advanced.resetStyles=스타일 재설정
 zotero.preferences.advanced.resetStyles.changesLost=모든 신규 또는 수정된 스타일을 잃게 됩니다.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=다음 파일은 목적 디렉토리내 이미 존재하며 복사하지는 않았습니다:
 dragAndDrop.filesNotFound=다음 파일을 찾을수 없어 복사를 할 수 없습니다.
 
@@ -500,7 +559,8 @@ fileInterface.import=불러오기
 fileInterface.export=내보내기
 fileInterface.exportedItems=내보낸 항목
 fileInterface.imported=불러들인
-fileInterface.fileFormatUnsupported=주어진 파일의 중계기를 찾을 수 없습니다.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=제목없는 참고 문헌 목록
 fileInterface.bibliographyHTMLTitle=참고 문헌 목록
 fileInterface.importError=선택한 파일을 불러오는 중에 오류가 발생했습니다. 파일이 유효한지를 확인 후 다시 시도해 주십시오.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=선택된 아이템은 참조를 포함하지 
 fileInterface.bibliographyGenerationError=참고 문헌 목록을 작성중 오류가 발생했습니다. 다시 시도해 주세요.
 fileInterface.exportError=선택된 파일의 내보내던 중 오류가 발생했습니다.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=고급 검색 방식 — 검색하려면 Enter키를 누르세요.
 searchInProgress=검색 진행중 — 잠시 기다려 주세요.
 
@@ -613,11 +677,12 @@ integration.cited.loading=인용된 항목 불러오는 중...
 integration.ibid=ibid
 integration.emptyCitationWarning.title=빈 인용
 integration.emptyCitationWarning.body=인용이 현재 선택된 스타일에는 없습니다. 그래도 추가하시겠습니까?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S 이 %2$S %3$S 이상을 필요로 합니다. zotero.org에서 최신버전의 %2$S 을 다운받으시기 바랍니다.
 integration.error.title=Zotero 통합 오류
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Zotero가 문서를 갱신하는 중에 오류를 경험했습니다.
 integration.error.mustInsertCitation=이 작업을 수행하기 전에 인용을 먼저 삽입해야 합니다.
 integration.error.mustInsertBibliography=이 작업을 수행하기 전에 참고문헌 목옥을 먼저 삽입해야 합니다.
@@ -643,14 +708,22 @@ integration.citationChanged=Zotero가 이 인용을 생성한 후, 수정이 이
 integration.citationChanged.description="예"를 클릭하면 인용추가, 스타일 변경, 참고하는 자료의 수정 등에 대해  Zotero가 이 인용을 업데이트하지 못하게 합니다. "아니오"를 클릭하면 수정한 내용이 삭제됩니다.
 integration.citationChanged.edit=Zotero가 이 인용을 생성한 후, 수정이 이루어졌습니다. 편집을 하면 수정 내용이 사라지게 됩니다. 계속 진행할까요?  
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=%2$S로 부터 %1$S(을)를 내보내시겠습니까?
 styles.updateStyle=%3$S(으)로 부터 기존 스타일 "%1$S"(을)를 "%2$S"(으)로 갱신합니다.
 styles.installed=스타일 "%S"(을)를 성공적으로 설치했습니다.
 styles.installError=%S(은)는 올바른 스타일 파일로 보이지 않습니다.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 styles.deleteStyle=정말로 "%1$S" 스타일을 삭제하길 원하십니까?
 styles.deleteStyles=정말로 선택된 스타일을 삭제하길 원하십니까?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=동기화 취소
 sync.openSyncPreferences=동기화 환경설정 열기...
 sync.resetGroupAndSync=그룹 및 동기화 재설정
@@ -660,8 +733,10 @@ sync.remoteObject=원격 개체
 sync.mergedObject=병합된 개체
 
 sync.error.usernameNotSet=사용자명 설정되지 않음
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=비밀번호 설정되지 않음
 sync.error.invalidLogin=올바르지 않은 사용자명 또는 비밀번호
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=비밀번호를 입력해 주세요.
 sync.error.loginManagerCorrupted1=Zotero가 손상된 Firefox로그인 관리자 데이터베이스로 인해 당신의 로그인 정보에 접근할 수 없습니다.
 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.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=계속 진행하면, 서버의 해당 그룹 상태
 sync.error.copyChangedItems=수정내용을 복사해 두거나 그룹 관리자로부터 쓰기 접근 권한을 요청하려면, 지금 동기화를 취소하십시오.
 sync.error.manualInterventionRequired=자동 동기화가 충돌을 일으켰으며, 이 문제를 수동으로 해결해야 합니다.
 sync.error.clickSyncIcon=수동으로 동기화하려면  sync 아이콘을 클릭하세요.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=아직 동기화되지 않음
 sync.status.lastSync=최종 동기화:
@@ -682,9 +792,12 @@ sync.status.uploadingData=동기화 서버로 자료 올려보내는 중
 sync.status.uploadAccepted=올려보내기 허용 — 동기화 서버를 기다리는 중
 sync.status.syncingFiles=파일 동기화중
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=남은 용량: %SKB
 sync.storage.filesRemaining=%1$S/%2$S 파일
 sync.storage.none=없음
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=지역 파일
 sync.storage.remoteFile=원격 파일
 sync.storage.savedFile=저장된 파일
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=서버 환경 확인
 sync.storage.fileSyncSetUp=파일 동기화가 성공적으로 설정되었습니다.
 sync.storage.openAccountSettings=계정 설정 열기
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=서버 %S에 도달할 수 있습니다.
 sync.storage.error.permissionDeniedAtAddress=다음 주소에서 Zotero 디렉토리를 만들 권한이 없습니다 : 
 sync.storage.error.checkFileSyncSettings=파일 동기화 설정을 점검하거나 서버 관리자에게 연락하십시오.
 sync.storage.error.verificationFailed=%S 검증 실패. Zotero 환경설정의 동기화 설정을 점검하십시오.
 sync.storage.error.fileNotCreated='%S' 파일은 Zotero의 'storage' 디렉토리에 만들어 질 수 없습니다.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=더이상 '%S' Zotero 그룹에 편집 접근을 할 수 없습니다. 추가했거나 편집한 파일이 서버로 동기화되지 않습니다.
 sync.storage.error.copyChangedItems=수정내용을 복사해 두거나 그룹 관리자로부터 쓰기 접근 권한을 요청하려면, 지금 동기화를 취소하십시오.
 sync.storage.error.fileUploadFailed=파일 올려보내기 실패.
 sync.storage.error.directoryNotFound=디렉토리를 찾을 수 없습니다
 sync.storage.error.doesNotExist=%S가 존재하지 않습니다.
 sync.storage.error.createNow=바로 생성하길 원하십니까?
-sync.storage.error.webdav.enterURL=WebDAV URL를 입력해 주세요.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S(은)는 WebDAV URL에 적합하지 않습니다.
 sync.storage.error.webdav.invalidLogin=WebDAV 서버에서 입력하신 사용자 이름과 비밀번호를 허용하지 않습니다.
 sync.storage.error.webdav.permissionDenied=WebDAV 서버의 %S 에 접근할 권한이 없습니다.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=%S에 연결중 SSL 접속 오류.
 sync.storage.error.webdav.loadURLForMoreInfo=웹 브라우저에 귀하의 WebDAV URL을 입력하면 자세한 정보를 볼 수 있습니다.
 sync.storage.error.webdav.seeCertOverrideDocumentation=자세한 정보는 도움말 참고
 sync.storage.error.webdav.loadURL=WebDAV URL 구동
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Zotero 파일 저장 할당량에 도달했습니다. 몇몇 파일은 업로드되지 않았습니다. 다른 Zotero 데이터는 서버로 계속 동기화됩니다.
 sync.storage.error.zfs.personalQuotaReached2=추가 저장소 선택사항을 위해 당신의 zotero.org 계정 설정을 표시합니다.
 sync.storage.error.zfs.groupQuotaReached1='%S' 그룹이 Zotero 파일 저장 할당량에 도달했습니다. 몇몇 파일은 업로드되지 않았습니다. 다른 Zotero 데이터는 서버로 계속 동기화됩니다.
 sync.storage.error.zfs.groupQuotaReached2=zotero.org의 스토리지 환경저장에서 그룹 소유자가 그룹 스토리지 할당량을 늘릴 수 있습니다.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=태그 저장
 sync.longTagFixer.saveTags=태그 저장
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=PDF로 부터 글을 읽을수 없습니다.
 recognizePDF.noMatches=일치하는 레퍼런스를 찾을 수 없음.
 recognizePDF.fileNotFound=파일을 찾을수 없음.
 recognizePDF.limit=쿼리 한계에 도달. 나중에 시도하십시오.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=메타데이터 검색 완료.
 recognizePDF.close.label=닫기
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=처리한 파일을 저장할 위치를 고르시오.
 rtfScan.scannedFileSuffix=(조사된)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=탐색 실패
 lookup.failure.description=선택한 식별자에 맞는 레코드를 찾을 수 없습니다. 식별자를 확인하고 재시도하십시오.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=온라인에서 보기
 locate.online.tooltip=온라인에서 이 항목으로 이동
diff --git a/chrome/locale/mn-MN/zotero/about.dtd b/chrome/locale/mn-MN/zotero/about.dtd
index be9c2d4c3b..7a1df9d3c8 100644
--- a/chrome/locale/mn-MN/zotero/about.dtd
+++ b/chrome/locale/mn-MN/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Тусгайлан баярлалаа.">
 <!ENTITY zotero.about.close "Хаах">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/mn-MN/zotero/preferences.dtd b/chrome/locale/mn-MN/zotero/preferences.dtd
index 9623cefbc6..e53055546c 100644
--- a/chrome/locale/mn-MN/zotero/preferences.dtd
+++ b/chrome/locale/mn-MN/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Анхдагч">
 <!ENTITY zotero.preferences.items "items">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Ерөнхий">
 
@@ -59,9 +60,14 @@
 <!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.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.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.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.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">
@@ -70,6 +76,7 @@
 <!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 "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reset...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Any string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Advanced">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Choose...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
diff --git a/chrome/locale/mn-MN/zotero/standalone.dtd b/chrome/locale/mn-MN/zotero/standalone.dtd
index f63a223052..e02c6a5a54 100644
--- a/chrome/locale/mn-MN/zotero/standalone.dtd
+++ b/chrome/locale/mn-MN/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/mn-MN/zotero/zotero.dtd b/chrome/locale/mn-MN/zotero/zotero.dtd
index 3e1d5cddde..aff7f09908 100644
--- a/chrome/locale/mn-MN/zotero/zotero.dtd
+++ b/chrome/locale/mn-MN/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Edit">
 <!ENTITY zotero.general.delete "Delete">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!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.">
 <!ENTITY zotero.errorReport.submitted "Your error report has been submitted.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Please post a message to the Zotero forums (forums.zotero.org) with this Report ID, a description of the problem, and any steps necessary to reproduce it.">
 <!ENTITY zotero.errorReport.notReviewed "Error reports are generally not reviewed unless referred to in the forums.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "You have installed a new version of Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Your Zotero database must be upgraded to work with the new version.">
 <!ENTITY zotero.upgrade.autoBackup "Your existing database will be backed up automatically before any changes are made.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Rights">
 <!ENTITY zotero.items.dateAdded_column "Date Added">
 <!ENTITY zotero.items.dateModified_column "Date Modified">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Show in Library">
 <!ENTITY zotero.items.menu.attach.note "Тэмдэглэл нэмэх">
@@ -75,8 +93,8 @@
 
 <!ENTITY zotero.toolbar.newItem.label "Шинэ бүтээл">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Бусад">
-<!ENTITY zotero.toolbar.newItemFromPage.label "Create New Item from Current Page">
-<!ENTITY zotero.toolbar.lookup.label "Add Item by Identifier">
+<!ENTITY zotero.toolbar.newItemFromPage.label "Create Web Page Item from Current Page">
+<!ENTITY zotero.toolbar.lookup.label "Add Item(s) by Identifier">
 <!ENTITY zotero.toolbar.removeItem.label "Remove Item...">
 <!ENTITY zotero.toolbar.newCollection.label "New Collection...">
 <!ENTITY zotero.toolbar.newGroup "New Group...">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transform Text">
 <!ENTITY zotero.item.textTransform.titlecase "Title Case">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "New Note">
 <!ENTITY zotero.toolbar.note.standalone "New Standalone Note">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Select visible">
 <!ENTITY zotero.tagSelector.clearVisible "Deselect visible">
 <!ENTITY zotero.tagSelector.clearAll "Deselect all">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Rename Tag...">
 <!ENTITY zotero.tagSelector.deleteTag "Delete Tag...">
 
-<!ENTITY zotero.lookup.description "Enter the ISBN, DOI, or PMID to look up in the box below.">
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
+<!ENTITY zotero.lookup.description "Enter one or more ISBNs, DOIs, or PMIDs to look up in the box below.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Select Items">
 <!ENTITY zotero.selectitems.intro.label "Select which items you'd like to add to your library">
@@ -208,6 +235,10 @@
 <!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.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!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/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties
index 272284a2b9..515463daa3 100644
--- a/chrome/locale/mn-MN/zotero/zotero.properties
+++ b/chrome/locale/mn-MN/zotero/zotero.properties
@@ -14,8 +14,11 @@ general.restartLater=Дараа ачаалах
 general.restartApp=Restart %S
 general.errorHasOccurred=An error has occurred.
 general.unknownErrorOccurred=An unknown error occurred.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Галт үнэг ахин ачаална уу.
-general.restartFirefoxAndTryAgain=Please restart %S and try again.
+general.restartFirefoxAndTryAgain=Please restart Firefox and try again.
 general.checkForUpdate=Check for update
 general.actionCannotBeUndone=This action cannot be undone.
 general.install=Суулга
@@ -35,8 +38,12 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -57,7 +64,7 @@ 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 %S to try the upgrade again.
+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...
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Press %S to send an error report to the Zotero develo
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=The Zotero data directory could not be found.
 dataDir.previousDir=Previous directory:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Use %S profile directory
 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?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=New Saved Search
 pane.collections.savedSearchName=Enter a name for this saved search:
 pane.collections.rename=Rename collection:
 pane.collections.library=Миний номын сан
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Trash
 pane.collections.untitled=Гарчиггүй
 pane.collections.unfiled=Unfiled Items
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Are you sure you want to delete this tag?\n\nThe
 pane.tagSelector.numSelected.none=0 tags selected
 pane.tagSelector.numSelected.singular=%S tag selected
 pane.tagSelector.numSelected.plural=%S tags selected
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Loading items list...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
 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?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S items selected
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Change Item Type
 pane.item.changeType.text=Are you sure you want to change the item type?\n\nThe following fields will be lost:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S хавсралтууд:
 pane.item.attachments.count.singular=%S хавсралт:
 pane.item.attachments.count.plural=%S хавсралтууд:
 pane.item.attachments.select=Файлыг сонгох
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=Энд сонго
-pane.item.tags=Tags:
 pane.item.tags.count.zero=%S tags:
 pane.item.tags.count.singular=%S tag:
 pane.item.tags.count.plural=%S tags:
 pane.item.tags.icon.user=User-added tag
 pane.item.tags.icon.automatic=Automatically added tag
-pane.item.related=Related:
 pane.item.related.count.zero=%S related:
 pane.item.related.count.singular=%S related:
 pane.item.related.count.plural=%S related:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=Бүтээлийг хадгалж...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=бүтээл хадгалсан
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
@@ -427,13 +468,14 @@ ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
 
 db.dbCorrupted=The Zotero database '%S' appears to have become corrupted.
-db.dbCorrupted.restart=Please restart %S to attempt an automatic restore from the last backup.
+db.dbCorrupted.restart=Please restart Firefox to attempt an automatic restore from the last backup.
 db.dbCorruptedNoBackup=The Zotero database '%S' appears to have become corrupted, and no automatic backup is available.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
 db.dbRestored=The Zotero database '%1$S' appears to have become corrupted.\n\nYour data was restored from the last automatic backup made on %2$S at %3$S. The damaged file was saved in your Zotero directory.
 db.dbRestoreFailed=The Zotero database '%S' appears to have become corrupted, and an attempt to restore from the last automatic backup failed.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S resolvers found
 zotero.preferences.openurl.resolversFound.singular=%S resolver found
 zotero.preferences.openurl.resolversFound.plural=%S resolvers found
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Rebuild Index
 zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
 zotero.preferences.search.clearIndex=Clear Index
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Any new or modified tra
 zotero.preferences.advanced.resetStyles=Reset Styles
 zotero.preferences.advanced.resetStyles.changesLost=Any new or modified styles will be lost.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
 
@@ -500,7 +559,8 @@ fileInterface.import=Импорт
 fileInterface.export=Экспорт
 fileInterface.exportedItems=Exported Items
 fileInterface.imported=Импортлогдсон
-fileInterface.fileFormatUnsupported=No translator could be found for the given file.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 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.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=The items you have selected contain no reference
 fileInterface.bibliographyGenerationError=An error occurred generating your bibliography. Please try again.
 fileInterface.exportError=An error occurred while trying to export the selected file.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Advanced search mode — press Enter to search.
 searchInProgress=Search in progress — please wait.
 
@@ -613,11 +677,12 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Blank Citation
 integration.emptyCitationWarning.body=The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Error
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Zotero experienced an error updating your document.
 integration.error.mustInsertCitation=You must insert a citation before performing this operation.
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Install style "%1$S" from %2$S?
 styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
 styles.installed=The style "%S" was installed successfully.
-styles.installError=%S does not appear to be a valid style file.
+styles.installError="%S" is not a valid style file.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 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?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancel Sync
 sync.openSyncPreferences=Open Sync Preferences...
 sync.resetGroupAndSync=Reset Group and Sync
@@ -660,18 +733,55 @@ sync.remoteObject=Remote Object
 sync.mergedObject=Merged Object
 
 sync.error.usernameNotSet=Username not set
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Password not set
 sync.error.invalidLogin=Invalid username or password
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 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 %S.
+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 '%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.error.manualInterventionRequired=Conflicts have suspended automatic syncing.
+sync.error.clickSyncIcon=Click the sync icon to resolve them.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Not yet synced
 sync.status.lastSync=Last sync:
@@ -682,9 +792,12 @@ 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.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB remaining
 sync.storage.filesRemaining=%1$S/%2$S files
 sync.storage.none=None
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Local File
 sync.storage.remoteFile=Remote File
 sync.storage.savedFile=Saved File
@@ -692,17 +805,23 @@ sync.storage.serverConfigurationVerified=Server configuration verified
 sync.storage.fileSyncSetUp=File sync is successfully set up.
 sync.storage.openAccountSettings=Open Account Settings
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=The server %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=%S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
 sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=You no longer have file editing access to the Zotero group '%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=%S does not exist.
 sync.storage.error.createNow=Do you want to create it now?
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
 sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1=The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2=The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Save Tag
 sync.longTagFixer.saveTags=Save Tags
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Could not read text from PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=File not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Close
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(Scanned)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/nb-NO/zotero/about.dtd b/chrome/locale/nb-NO/zotero/about.dtd
index e56f58ebb2..00bbae218f 100644
--- a/chrome/locale/nb-NO/zotero/about.dtd
+++ b/chrome/locale/nb-NO/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Spesiell takk til:">
 <!ENTITY zotero.about.close "Lukk">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/nb-NO/zotero/preferences.dtd b/chrome/locale/nb-NO/zotero/preferences.dtd
index e3e3816fe6..a621bfdcd3 100644
--- a/chrome/locale/nb-NO/zotero/preferences.dtd
+++ b/chrome/locale/nb-NO/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Standard:">
 <!ENTITY zotero.preferences.items "items">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Generelt">
 
@@ -59,9 +60,14 @@
 <!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.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.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.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.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">
@@ -70,6 +76,7 @@
 <!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 "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reset...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Hent flere stiler...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Hurtigtaster">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Any string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avansert">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Velg...">
 <!ENTITY zotero.preferences.dataDir.reveal "Vis datamappe">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Vedlikehold av database">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Kontroller databasen">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Nullstill oversettere og stiler...">
diff --git a/chrome/locale/nb-NO/zotero/standalone.dtd b/chrome/locale/nb-NO/zotero/standalone.dtd
index f63a223052..e02c6a5a54 100644
--- a/chrome/locale/nb-NO/zotero/standalone.dtd
+++ b/chrome/locale/nb-NO/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/nb-NO/zotero/zotero.dtd b/chrome/locale/nb-NO/zotero/zotero.dtd
index 67e8747dfb..bf31085158 100644
--- a/chrome/locale/nb-NO/zotero/zotero.dtd
+++ b/chrome/locale/nb-NO/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Edit">
 <!ENTITY zotero.general.delete "Delete">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Denne feilloggen kan inneholde meldinger som ikke har noe med Zotero å gjøre.">
 <!ENTITY zotero.errorReport.submissionInProgress "Vennligst vent mens feilrapporten blir levert.">
 <!ENTITY zotero.errorReport.submitted "Feilrapporten er levert.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Vennligst skriv en melding i Zotero-forumene (forums.zotero.org) med denne rapport-IDen, en beskrivelse av problemet og nødvendige steg for å reprodusere problemet.">
 <!ENTITY zotero.errorReport.notReviewed "Feilrapporter blir vanligvis ikke kommentert, dersom problemet ikke tas opp i forumene.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Du ha installert en ny versjon av Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Zotero-databasen din må oppgraderes for å fungere med den nye versjonen.">
 <!ENTITY zotero.upgrade.autoBackup "Det lages en sikkerhetskopi av den eksisterende databasen før den oppgraderes.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Rettigheter">
 <!ENTITY zotero.items.dateAdded_column "Lagt til">
 <!ENTITY zotero.items.dateModified_column "Sist endret">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Vis i bibliotek">
 <!ENTITY zotero.items.menu.attach.note "Legg til notat">
@@ -76,7 +94,7 @@
 <!ENTITY zotero.toolbar.newItem.label "Nytt element">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Mer">
 <!ENTITY zotero.toolbar.newItemFromPage.label "Skap nytt element fra gjeldende side">
-<!ENTITY zotero.toolbar.lookup.label "Add Item by Identifier">
+<!ENTITY zotero.toolbar.lookup.label "Add Item(s) by Identifier">
 <!ENTITY zotero.toolbar.removeItem.label "Fjern element...">
 <!ENTITY zotero.toolbar.newCollection.label "Ny samling...">
 <!ENTITY zotero.toolbar.newGroup "New Group...">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Gjør om tekst">
 <!ENTITY zotero.item.textTransform.titlecase "Tittel-format">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "New Note">
 <!ENTITY zotero.toolbar.note.standalone "Nytt enkeltstående notat">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Velg synlig">
 <!ENTITY zotero.tagSelector.clearVisible "Slipp synlig">
 <!ENTITY zotero.tagSelector.clearAll "Slipp alle">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Gi tagg nytt navn...">
 <!ENTITY zotero.tagSelector.deleteTag "Slett tagg...">
 
-<!ENTITY zotero.lookup.description "Enter the ISBN, DOI, or PMID to look up in the box below.">
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
+<!ENTITY zotero.lookup.description "Enter one or more ISBNs, DOIs, or PMIDs to look up in the box below.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Velg elementer">
 <!ENTITY zotero.selectitems.intro.label "Velg hvilke enheter du vil legge til biblioteket ditt">
@@ -208,6 +235,10 @@
 <!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.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!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/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties
index 4cf032c14d..6a68f5920f 100644
--- a/chrome/locale/nb-NO/zotero/zotero.properties
+++ b/chrome/locale/nb-NO/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Start på nytt senere
 general.restartApp=Restart %S
 general.errorHasOccurred=En feil oppstod.
 general.unknownErrorOccurred=An unknown error occurred.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Vennligst start Firefox på nytt.
 general.restartFirefoxAndTryAgain=Vennligst start Firefox på nytt og prøv igjen.
 general.checkForUpdate=Se etter oppdatering
@@ -35,8 +38,12 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -57,7 +64,7 @@ upgrade.advanceMessage=Velg %S for å oppgradere nå.
 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 %S to try the upgrade again.
+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...
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Velg %S for å sende en feilrapport til Zotero-utvikl
 errorReport.stepsToReproduce=Trinn for å reprodusere feilen:
 errorReport.expectedResult=Forventet resultat:
 errorReport.actualResult=Faktisk resultat:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Zoteros datamappe ble ikke funnet.
 dataDir.previousDir=Forrige mappe:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Bruk profilmappen til Firefox
 dataDir.selectDir=Velg en datamappe
 dataDir.selectedDirNonEmpty.title=Mappen er ikke tom
 dataDir.selectedDirNonEmpty.text=Mappen du valgte er ikke tom og ser ikke ut til å være en Zotero-datamappe.\n\nSkal Zotero likevel opprette datafiler i denne mappen?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Nytt lagret søk
 pane.collections.savedSearchName=Oppgi navn på dette lagrede søket:
 pane.collections.rename=Gi samlingen nytt navn:
 pane.collections.library=Mitt bibliotek
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Trash
 pane.collections.untitled=Uten tittel
 pane.collections.unfiled=Unfiled Items
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Er du sikker på at du vil slette denne taggen?\
 pane.tagSelector.numSelected.none=0 tagger valgt
 pane.tagSelector.numSelected.singular=%S tagg valgt
 pane.tagSelector.numSelected.plural=%S tagger valgt
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Laster elementliste...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
 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?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S elementer er valgt
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Endre elementtype
 pane.item.changeType.text=Vil du virkelig forandre elementtypen?\n\nDe følgende feltene vil bli slettet:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S vedlegg:
 pane.item.attachments.count.singular=%S vedlegg:
 pane.item.attachments.count.plural=%S vedlegg:
 pane.item.attachments.select=Velg en fil
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=Klikk her
-pane.item.tags=Tagger:
 pane.item.tags.count.zero=%S tagger:
 pane.item.tags.count.singular=%S tagg:
 pane.item.tags.count.plural=%S tagger:
 pane.item.tags.icon.user=Brukerdefinert tagg:
 pane.item.tags.icon.automatic=Automatisk tagg:
-pane.item.related=Relatert:
 pane.item.related.count.zero=%S relaterte:
 pane.item.related.count.singular=%S relatert:
 pane.item.related.count.plural=%S relaterte:
@@ -286,7 +326,7 @@ itemFields.distributor=Distributør
 itemFields.extra=Ekstra
 itemFields.journalAbbreviation=Tidsskriftsforkortelse
 itemFields.DOI=DOI
-itemFields.accessDate=Aksessert
+itemFields.accessDate=Lest
 itemFields.seriesTitle=Serietittel
 itemFields.seriesText=Serietekst
 itemFields.seriesNumber=Serienummer
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Lagre i Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=Lagrer element...
+ingester.scrapingTo=Saving to
 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.
@@ -427,7 +468,8 @@ ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S "resolvers" funnet
 zotero.preferences.openurl.resolversFound.singular=%S "resolver" funnet
 zotero.preferences.openurl.resolversFound.plural=%S "resolvers" funnet
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Generer register på nytt
 zotero.preferences.search.rebuildWarning=Vil du generere registeret på nytt? Dette kan ta en stund.\n\nHvis du bare vil registrere elementer som ikke allerede er registrert, bruk %S.
 zotero.preferences.search.clearIndex=Tøm registeret
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Alle nye eller endrede
 zotero.preferences.advanced.resetStyles=Nullstill stiler
 zotero.preferences.advanced.resetStyles.changesLost=Alle nye eller endrede stiler fjernes.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=De følgende filene fantes allerede i målmappen og ble ikke kopiert:
 dragAndDrop.filesNotFound=De følgende filene ble ikke funnet og kunne ikke kopieres:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importer
 fileInterface.export=Eksporter
 fileInterface.exportedItems=Eksporterte elementer
 fileInterface.imported=Importert
-fileInterface.fileFormatUnsupported=Ingen oversetter ble funnet for den gjeldende filen.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Bibliografi uten tittel
 fileInterface.bibliographyHTMLTitle=Bibliografi
 fileInterface.importError=En feil oppsto under importeringen av den valgte filen. Du bør forsikre deg om at filen er gyldig før du prøver igjen.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Elementene du valgte inneholder ingen referanser
 fileInterface.bibliographyGenerationError=En feil oppsto under genereringen av bibliografien. Vennligst prøv igjen.
 fileInterface.exportError=En feil oppsto under eksporteringen av den valgte filen.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Avansert søkemodus — trykk Enter for å søke.
 searchInProgress=Søk pågår — vennligst vent.
 
@@ -613,11 +677,12 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Blank Citation
 integration.emptyCitationWarning.body=The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Error
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Zotero experienced an error updating your document.
 integration.error.mustInsertCitation=You must insert a citation before performing this operation.
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Installere stilen "%1$S" fra %2$S?
 styles.updateStyle=Oppdatere den eksisterende stilen "%1$S" til "%2$S" fra %3$S?
 styles.installed=Installasjon av stilen "%S" var vellykket.
-styles.installError=%S does not appear to be a valid style file.
+styles.installError="%S" is not a valid style file.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 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?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancel Sync
 sync.openSyncPreferences=Open Sync Preferences...
 sync.resetGroupAndSync=Reset Group and Sync
@@ -660,18 +733,55 @@ sync.remoteObject=Remote Object
 sync.mergedObject=Merged Object
 
 sync.error.usernameNotSet=Username not set
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Password not set
 sync.error.invalidLogin=Invalid username or password
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 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 %S.
+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 '%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.error.manualInterventionRequired=Conflicts have suspended automatic syncing.
+sync.error.clickSyncIcon=Click the sync icon to resolve them.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Not yet synced
 sync.status.lastSync=Last sync:
@@ -682,9 +792,12 @@ 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.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB remaining
 sync.storage.filesRemaining=%1$S/%2$S files
 sync.storage.none=None
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Local File
 sync.storage.remoteFile=Remote File
 sync.storage.savedFile=Saved File
@@ -692,17 +805,23 @@ sync.storage.serverConfigurationVerified=Server configuration verified
 sync.storage.fileSyncSetUp=File sync is successfully set up.
 sync.storage.openAccountSettings=Open Account Settings
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=The server %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=%S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
 sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=You no longer have file editing access to the Zotero group '%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=%S does not exist.
 sync.storage.error.createNow=Do you want to create it now?
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
 sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1=The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2=The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Save Tag
 sync.longTagFixer.saveTags=Save Tags
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Could not read text from PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=File not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Close
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(Scanned)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/nl-NL/zotero/about.dtd b/chrome/locale/nl-NL/zotero/about.dtd
index 7edf2fdd5e..092d11e035 100644
--- a/chrome/locale/nl-NL/zotero/about.dtd
+++ b/chrome/locale/nl-NL/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Met speciale dank aan:">
 <!ENTITY zotero.about.close "Sluiten">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Meer dankbetuigingen">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/nl-NL/zotero/preferences.dtd b/chrome/locale/nl-NL/zotero/preferences.dtd
index 36764a0562..0facc3e4cc 100644
--- a/chrome/locale/nl-NL/zotero/preferences.dtd
+++ b/chrome/locale/nl-NL/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Standaard:">
 <!ENTITY zotero.preferences.items "objecten">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Algemeen">
 
@@ -38,7 +39,7 @@
 <!ENTITY zotero.preferences.groups.childNotes "bijbehorende aantekeningen">
 <!ENTITY zotero.preferences.groups.childFiles "bijbehorende snapshots en geïmporteerde bestanden">
 <!ENTITY zotero.preferences.groups.childLinks "bijbehorende koppelingen">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "labels">
 
 <!ENTITY zotero.preferences.openurl.caption "OpenURL">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Synchroniseer bestanden in Mijn Bibliotheek met">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Synchroniseer bestanden in groepsbibliotheken met Zotero-opslag">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Door het gebruiken van Zotero-opslag gaat u akkoord met de bijbehorende">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "termen en voorwaarden">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Volledige synchronisatie met de Zotero-server">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Lokale Zotero-gegevens samenvoegen met de gegevens op de Zotero-server (houdt geen rekening met synchronisatiegeschiedenis).">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Herstellen vanaf Zotero-server">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Alle gegevens op de server wissen en vervangen door de lokale Zotero-gegevens.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Bestandssynchronisatiegeschiedenis wissen">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Controle forceren of alle lokale bestanden op de server aanwezig zijn.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Herstellen…">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titel">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Bijgewerkt">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Meer stijlen installeren…">
 
 <!ENTITY zotero.preferences.prefpane.keys "Sneltoetsen">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Willekeurige tekenreeks">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Geavanceerd">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Opzoeken">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Manager voor artikel-opzoekmechanismes">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Kiezen…">
 <!ENTITY zotero.preferences.dataDir.reveal "Opslagmap tonen">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Database-onderhoud">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Controleer database-integriteit">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Vertalers en stijlen herstellen…">
diff --git a/chrome/locale/nl-NL/zotero/standalone.dtd b/chrome/locale/nl-NL/zotero/standalone.dtd
index fd6f947c1e..da8ea332d0 100644
--- a/chrome/locale/nl-NL/zotero/standalone.dtd
+++ b/chrome/locale/nl-NL/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Sluiten">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
diff --git a/chrome/locale/nl-NL/zotero/zotero.dtd b/chrome/locale/nl-NL/zotero/zotero.dtd
index a9621c1c57..b04424dd83 100644
--- a/chrome/locale/nl-NL/zotero/zotero.dtd
+++ b/chrome/locale/nl-NL/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Bewerken">
 <!ENTITY zotero.general.delete "Verwijderen">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Het foutenlogboek kan berichten bevatten die niet gerelateerd zijn aan Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Even geduld a.u.b. totdat het foutenrapport is verstuurd.">
 <!ENTITY zotero.errorReport.submitted "Het foutenrapport is verstuurd.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Plaats een bericht op het (Engelstalige) Zotero forum (forums.zotero.org) onder vermelding van het Rapport ID, een omschrijving van het probleem, en de stappen die nodig zijn om het probleem te reproduceren.">
 <!ENTITY zotero.errorReport.notReviewed "Foutenrapporten worden niet bekeken tenzij u ernaar verwijst in het forum.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "U heeft een nieuwe versie van Zotero geinstalleerd.">
 <!ENTITY zotero.upgrade.upgradeRequired "Uw Zotero database moet bijgewerkt worden om te kunnen werken met de nieuwe versie.">
 <!ENTITY zotero.upgrade.autoBackup "Er zal een reservekopie van uw bestaande database worden gemaakt voordat er wijzigingen worden doorgevoerd.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Rechten">
 <!ENTITY zotero.items.dateAdded_column "Toevoegdatum">
 <!ENTITY zotero.items.dateModified_column "Bewerkingsdatum">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "In bibliotheek tonen">
 <!ENTITY zotero.items.menu.attach.note "Aantekening toevoegen">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Hoofdlettergebruik wijzigen">
 <!ENTITY zotero.item.textTransform.titlecase "Alle woorden (Title Case)">
 <!ENTITY zotero.item.textTransform.sentencecase "Eerste woord (Sentence case)">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nieuwe aantekening">
 <!ENTITY zotero.toolbar.note.standalone "Nieuwe zelfstandige aantekening">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Getoonde labels selecteren">
 <!ENTITY zotero.tagSelector.clearVisible "Selectie getoonde labels ongedaan maken">
 <!ENTITY zotero.tagSelector.clearAll "Niets selecteren">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Label hernoemen…">
 <!ENTITY zotero.tagSelector.deleteTag "Label verwijderen…">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Voer hieronder de op te zoeken ISBN, DOI of PMID in.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Objecten selecteren">
 <!ENTITY zotero.selectitems.intro.label "Selecteer de objecten die u aan uw bibliotheek wilt toevoegen">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Niet aangevinkte labels worden niet bewaard.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Het label zal van alle objecten worden verwijdered.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Proxy herkend">
 <!ENTITY zotero.proxy.recognized.warning "Voeg alleen proxies toe van uw bibliotheek-, school- of bedrijfswebsite.">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Door het toevoegen van andere proxies kunnen kwaadwillende webpagina's zich als betrouwbare webpagina's voordoen.">
diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties
index 5aedb15183..bc0657140a 100644
--- a/chrome/locale/nl-NL/zotero/zotero.properties
+++ b/chrome/locale/nl-NL/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Later herstarten
 general.restartApp=Restart %S
 general.errorHasOccurred=Er is een fout opgetreden.
 general.unknownErrorOccurred=Er is een onbekende fout opgetreden.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Herstart Firefox.
 general.restartFirefoxAndTryAgain=Herstart Firefox en probeer het opnieuw.
 general.checkForUpdate=Naar update zoeken
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Zie %S voor meer informatie.
 general.enable=Aanzetten
 general.disable=Uitzetten
 general.remove=Verwijderen
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Documentatie openen
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Zotero is bezig.
 general.operationInProgress.waitUntilFinished=Wacht tot Zotero klaar is.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Druk op %S om een fouten-rapport te versturen naar de
 errorReport.stepsToReproduce=Stappen om te reproduceren:
 errorReport.expectedResult=Verwachte resultaat:
 errorReport.actualResult=Werkelijke resultaat:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=De Zotero-opslagmap kon niet worden gevonden.
 dataDir.previousDir=Vorige map:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Firefox profiel-map gebruiken
 dataDir.selectDir=Selecteer een Zotero-opslagmap
 dataDir.selectedDirNonEmpty.title=Map niet leeg
 dataDir.selectedDirNonEmpty.text=De geselecteerde map is niet leeg and lijkt geen Zotero-opslagmap te zijn.\n\nWilt u Zotero toch bestanden aan laten maken in deze map?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Bestaande Zotero-bibliotheek gevonden
 dataDir.standaloneMigration.description=U lijkt %1$S voor de eerste keer te gebruiken. Wilt u %1$S de instellingen laten importeren van %2$S en de bestaande opslagmap laten gebruiken?
 dataDir.standaloneMigration.multipleProfiles=%1$S zal de opslagmap delen met het meest recente gebruikte profiel.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Nieuwe bewaarde zoekopdracht
 pane.collections.savedSearchName=Geef een naam aan deze bewaarde zoekopdracht:
 pane.collections.rename=Naam verzameling wijzigen:
 pane.collections.library=Mijn Bibliotheek
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Prullenbak
 pane.collections.untitled=Zonder Titel
 pane.collections.unfiled=Ongesorteerde objecten
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Wilt u dit label verwijderen?\n\nHet label zal v
 pane.tagSelector.numSelected.none=0 labels geselecteerd
 pane.tagSelector.numSelected.singular=%S label geselecteerd
 pane.tagSelector.numSelected.plural=%S labels geselecteerd
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Objecten-lijst wordt geladen…
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Naar prullenbak verplaatsen
 pane.items.trash=Wilt u het geselecteerde object naar de prullenbak verplaatsen?
 pane.items.trash.multiple=Wilt u de geselecteerde objecten naar de prullenbak verplaatsen?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S objecten geselecteerd
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Object-type veranderen
 pane.item.changeType.text=Wilt u het object-type veranderen?\n\nDe volgende velden zullen verloren gaan:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S bijlages:
 pane.item.attachments.count.singular=%S bijlage:
 pane.item.attachments.count.plural=%S bijlages:
 pane.item.attachments.select=Selecteer een bestand
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=klik hier
-pane.item.tags=Labels:
 pane.item.tags.count.zero=%S labels:
 pane.item.tags.count.singular=%S label:
 pane.item.tags.count.plural=%S labels:
 pane.item.tags.icon.user=Door gebruiker toegevoegd label
 pane.item.tags.icon.automatic=Automatisch toegevoegd label
-pane.item.related=Gerelateerd:
 pane.item.related.count.zero=%S gerelateerd:
 pane.item.related.count.singular=%S gerelateerd:
 pane.item.related.count.plural=%S gerelateerd:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=U kunt geen bestanden toevoegen aan de nu
 ingester.saveToZotero=In Zotero opslaan
 ingester.saveToZoteroUsing=In Zotero opslaan met "%S"
 ingester.scraping=Object wordt opgeslagen…
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Object is opgeslagen
 ingester.scrapeError=Object kon niet opgeslagen worden.
 ingester.scrapeErrorDescription=Er is een fout opgetreden bij het opslaan van dit object. Zie %S voor meer informatie.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=Altijd gebruiken voor deze website
 
 ingester.importFile.title=Bestand importeren
 ingester.importFile.text=Wilt u het bestand "%S" importeren?\n\nObjecten zullen aan een nieuwe verzameling worden toegevoegd.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Bezig met opzoeken…
 ingester.lookup.error=Er is een fout opgetreden bij het opzoeken van dit object.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S resolvers gevonden
 zotero.preferences.openurl.resolversFound.singular=%S resolver gevonden
 zotero.preferences.openurl.resolversFound.plural=%S resolvers gevonden
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Index herbouwen
 zotero.preferences.search.rebuildWarning=Wilt u de hele index herbouwen? Dit kan even duren.\n\nOm enkel items te indexeren die nog niet geïndexeerd zijn, gebruik %S.
 zotero.preferences.search.clearIndex=Index wissen
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Nieuwe of aangepaste ve
 zotero.preferences.advanced.resetStyles=Stijlen herstellen
 zotero.preferences.advanced.resetStyles.changesLost=Nieuwe of aangepaste stijlen zullen verloren gaan.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=De volgende bestanden waren al aanwezig in de bestemmingsmap en zijn niet gekopieerd:
 dragAndDrop.filesNotFound=De volgende bestanden konden niet gevonden worden en zijn niet gekopieerd:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importeren
 fileInterface.export=Exporteren
 fileInterface.exportedItems=Geëxporteerde objecten
 fileInterface.imported=Geïmporteerde objecten
-fileInterface.fileFormatUnsupported=Voor dit bestand kon geen vertaler worden gevonden.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Bibliografie zonder titel
 fileInterface.bibliographyHTMLTitle=Bibliografie
 fileInterface.importError=Er is een fout opgetreden bij het importeren van het geselecteerde bestand. Controleer dat het bestand correct is en probeer opnieuw.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=De door u geselecteerde objecten bevatten geen r
 fileInterface.bibliographyGenerationError=Er is een fout opgetreden bij het aanmaken van uw bibliografie. Probeer opnieuw.
 fileInterface.exportError=Er is een fout opgetreden bij het exporteren van het geselecteerde bestand.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Uitgebreid zoeken — druk op Enter om te zoeken.
 searchInProgress=Bezig met zoeken - even geduld a.u.b.
 
@@ -613,6 +677,7 @@ integration.cited.loading=Geciteerd objecten wordt geladen…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Lege verwijzing
 integration.emptyCitationWarning.body=De opgegeven verwijzing zou leeg zijn met de geselecteerde stijl. Wilt u de verwijzing toch toevoegen?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Deze versie van de Zotero tekstverwerker-plugin ($INTEGRATION_VERSION) is niet geschikt voor de geïnstalleerde versie van Zotero (%1$S). Zorg ervoor dat van beide componenten de laatste versie is geïnstalleerd.
 integration.error.incompatibleVersion2=Zotero %1$S heeft %2$S %3$S of nieuwer nodig. Download de nieuwste versie van %2$S vanaf zotero.org.
@@ -643,14 +708,22 @@ integration.citationChanged=U heeft deze door Zotero gemaakte verwijzing aangepa
 integration.citationChanged.description=Als u op "Ja" klikt zal Zotero de verwijzing niet bijwerken als u andere verwijzingen toevoegt, de stijl veranderd, of de geciteerde referentie bijwerkt. Als u op "Nee" klikt gaan uw wijzigingen verloren.
 integration.citationChanged.edit=U heeft deze door Zotero gemaakte verwijzing aangepast. Als u de verwijzing wilt bewerken gaan deze aanpassen verloren. Wilt u doorgaan?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Stijl "%1$S" vanuit %2$S installeren?
 styles.updateStyle=Bestaande stijl "%1$S" bijwerken met "%2$S" vanuit %3$S?
 styles.installed=Stijl "%S" is met succes geïnstalleerd.
 styles.installError=%S lijkt geen correct stijl-bestand te zijn.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S verwijst naar een incorrect of niet bestaand CSL-bestand op %2$S.
 styles.deleteStyle=Wilt u de stijl "%1$S" verwijderen?
 styles.deleteStyles=Wilt u de geselecteerde stijlen verwijderen?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Synchronisatie annuleren
 sync.openSyncPreferences=Synchronisatie-voorkeuren openen…
 sync.resetGroupAndSync=Groep en synchronisatie herstellen
@@ -660,8 +733,10 @@ sync.remoteObject=Server-object
 sync.mergedObject=Samengevoegd object
 
 sync.error.usernameNotSet=Gebruikersnaam niet ingesteld
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Wachtwoord niet ingesteld
 sync.error.invalidLogin=Ongeldige gebruikersnaam of wachtwoord
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Voer een wachtwoord in.
 sync.error.loginManagerCorrupted1=Zotero kan uw aanmeld-informatie niet benaderen, vermoedelijk vanwege een beschadigde Firefox login manager-database.
 sync.error.loginManagerCorrupted2=Sluit %S, maak een backup en verwijder signons.* uit uw %S profiel, en voer opnieuw uw Zotero aanmeld-informatie in bij het Synchronisatie-paneel van de Zotero-voorkeuren.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Als u doorgaat zal uw kopie van de groep worden verv
 sync.error.copyChangedItems=Annuleer de synchronisatie als u eerst uw wijzigingen wilt opslaan, of als u schrijf-toegangsrechten wilt aanvragen bij de groepbeheerder.
 sync.error.manualInterventionRequired=Een automatische synchronisatie heeft tot een conflict geleidt dat handmatig opgelost moet worden.
 sync.error.clickSyncIcon=Klik op het synchronisatie-pictogram om handmatig te synchroniseren.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Nog niet gesynchroniseerd
 sync.status.lastSync=Laatste synchronisatie:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Bezig met het uploaden van gegevens naar de synchronis
 sync.status.uploadAccepted=Upload geaccepteerd — aan het wachten op de synchronisatie-server
 sync.status.syncingFiles=Bezig met het synchroniseren van bestanden
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB over
 sync.storage.filesRemaining=%1$S/%2$S bestanden
 sync.storage.none=Geen
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Lokaal bestand
 sync.storage.remoteFile=Server-bestand
 sync.storage.savedFile=Bestand opgeslagen
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Serverinstellingen gecontroleerd
 sync.storage.fileSyncSetUp=Bestandssynchronisatie is succesvol opgezet.
 sync.storage.openAccountSettings=Open account-instellingen
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=De server %S kon niet worden bereikt.
 sync.storage.error.permissionDeniedAtAddress=U heeft geen toegangsrechten om een Zotero-map aan te maken op het volgende adres:
 sync.storage.error.checkFileSyncSettings=Controleer uw bestandssynchronisatie-instellingen of neem contact op met uw serveradministrator.
 sync.storage.error.verificationFailed=%S controle mislukt. Controleer uw bestandssynchronisatie-instellingen in het synchronisatie-paneel in de Zotero-voorkeuren.
 sync.storage.error.fileNotCreated=Het bestand '%S' kon niet worden aangemaakt in de Zotero-opslagmap.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=U heeft geen toegangsrechten meer om bestanden te wijzigen in de Zotero-groep '%S'. Bestanden die u heeft toegevoegd of gewijzigd kunnen niet met de server worden gesynchroniseerd.
 sync.storage.error.copyChangedItems=Annuleer de synchronisatie als u eerst uw gewijzigde objecten en bestanden elders wilt opslaan.
 sync.storage.error.fileUploadFailed=Upload van bestanden mislukt.
 sync.storage.error.directoryNotFound=Map niet gevonden
 sync.storage.error.doesNotExist=%S bestaat niet.
 sync.storage.error.createNow=Wilt u deze nu aanmaken?
-sync.storage.error.webdav.enterURL=Voer een WebDAV-URL in.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S is geen geldige WebDAV-URL.
 sync.storage.error.webdav.invalidLogin=De WebDAV-server heeft het door u ingevoerde gebruikersnaam en wachtwoord geweigerd.
 sync.storage.error.webdav.permissionDenied=U heeft geen toegangsrechten om %S te benaderen op de WebDAV-server.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL-verbindingsfout bij het leggen
 sync.storage.error.webdav.loadURLForMoreInfo=Laad uw WebDAV-URL in uw browser voor meer informatie.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Zie de "certificate override"-documentatie voor meer informatie.
 sync.storage.error.webdav.loadURL=WebDAV-URL laden
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=U heeft uw Zotero File Storage-quotum bereikt. Sommige bestanden zijn niet geüpload. De overige Zotero-gegevens worden wel gesynchroniseerd.
 sync.storage.error.zfs.personalQuotaReached2=Bekijk de zotero.org account-instellingen voor de mogelijkheden voor meer opslagcapaciteit.
 sync.storage.error.zfs.groupQuotaReached1=De groep '%S' heeft zijn Zotero File Storage-quotum bereikt. Sommige bestanden zijn niet geüpload. De overige Zotero-gegevens worden wel gesynchroniseerd.
 sync.storage.error.zfs.groupQuotaReached2=De groepseigenaar kan de opslagcapaciteit van de groep vergroten via de opslaginstellingen op zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Label opslaan
 sync.longTagFixer.saveTags=Labels opslaan
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Het was niet mogelijk om PDF-tekst te lezen.
 recognizePDF.noMatches=Geen overeenkomende referenties gevonden.
 recognizePDF.fileNotFound=Bestand niet gevonden.
 recognizePDF.limit=Aanvraaglimiet bereikt. Probeer het later opnieuw.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Ophalen van metadata voltooid.
 recognizePDF.close.label=Sluiten
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Uitgebreide tekstopmaak (.rtf)
 rtfScan.saveTitle=Selecteer een locatie om het opgemaakte bestand op te slaan
 rtfScan.scannedFileSuffix=(gescand)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Opzoeken mislukt
 lookup.failure.description=Zotero kon geen object vinden voor de opgegeven identificatiecode. Controleer of de identificatiecode correct is ingevoerd en probeer het opnieuw.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Online bekijken
 locate.online.tooltip=Ga naar dit object online
diff --git a/chrome/locale/nn-NO/zotero/about.dtd b/chrome/locale/nn-NO/zotero/about.dtd
index 23628f055a..4defa70302 100644
--- a/chrome/locale/nn-NO/zotero/about.dtd
+++ b/chrome/locale/nn-NO/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Spesiell takk til:">
 <!ENTITY zotero.about.close "Lukk">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Meir godskriving og takk">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/nn-NO/zotero/preferences.dtd b/chrome/locale/nn-NO/zotero/preferences.dtd
index 55c6c792ff..96369bd469 100644
--- a/chrome/locale/nn-NO/zotero/preferences.dtd
+++ b/chrome/locale/nn-NO/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Standard:">
 <!ENTITY zotero.preferences.items "items">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Generelt">
 
@@ -59,9 +60,14 @@
 <!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.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Ved å bruka Zotero-lagring godtek du ">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "vilkåra for bruk">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Full synkronisering med Zotero-tenaren">
 <!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">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Erase all servar 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 "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reset...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Tittel">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Oppdatert">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Hent fleire stilar …">
 
 <!ENTITY zotero.preferences.prefpane.keys "Snøggtastar">
@@ -154,13 +162,14 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Any string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avansert">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Lokaliser">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
 <!ENTITY zotero.preferences.locate.description "Skildring">
 <!ENTITY zotero.preferences.locate.name "Name">
 <!ENTITY zotero.preferences.locate.locateEnginedescription "A Lookup Engine extends the capability of the Locate drop down in the Info pane. By enabling Lookup Engines in the list below they will be added to the drop down and can be used to locate resources from your library on the web.">
-<!ENTITY zotero.preferences.locate.addDescription "To add a Lookup Engine that is not on the list, visit the desired search engine in your browser and select 'Add' from the Firefox Search Bar. When you reopen this preference pane you will have the option to enable the new Lookup Engine.">
+<!ENTITY zotero.preferences.locate.addDescription "Dersom du vil leggje til ein oppslagsmotor som ikkje er i lista, besøker du søkemotoren du ynskjer å leggje til og vel «Legg til» i Zotero sin lokaliseringsmeny.">
 <!ENTITY zotero.preferences.locate.restoreDefaults "Restore Defaults">
 
 <!ENTITY zotero.preferences.charset "Character Encoding">
@@ -168,11 +177,17 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Lagringsplass">
-<!ENTITY zotero.preferences.dataDir.useProfile "Bruk profilmappa til Firefox.">
+<!ENTITY zotero.preferences.dataDir.useProfile "Bruk profilmappa">
 <!ENTITY zotero.preferences.dataDir.custom "Egendefinert:">
 <!ENTITY zotero.preferences.dataDir.choose "Vel …">
 <!ENTITY zotero.preferences.dataDir.reveal "Vis datamappe">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Vedlikehald av database">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Kontroller databasen">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Nullstill omsetjarar og stilar …">
diff --git a/chrome/locale/nn-NO/zotero/standalone.dtd b/chrome/locale/nn-NO/zotero/standalone.dtd
index 98ff01c695..e50c91d068 100644
--- a/chrome/locale/nn-NO/zotero/standalone.dtd
+++ b/chrome/locale/nn-NO/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Lukk">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "Om &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Hjelp og dokumentasjon">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Feilsøking">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Send tilbakemelding …">
diff --git a/chrome/locale/nn-NO/zotero/zotero.dtd b/chrome/locale/nn-NO/zotero/zotero.dtd
index 05e6889878..5a3961987c 100644
--- a/chrome/locale/nn-NO/zotero/zotero.dtd
+++ b/chrome/locale/nn-NO/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Endre">
 <!ENTITY zotero.general.delete "Slett">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Denne feilloggen kan innehalde meldingar som ikkje har noko med Zotero å gjere.">
 <!ENTITY zotero.errorReport.submissionInProgress "Vennligst vent medan feilrapporten vert levert.">
 <!ENTITY zotero.errorReport.submitted "Feilrapporten er levert.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Ver god og skriv ei melding i Zotero-foruma (forums.zotero.org) med denne rapport-IDen, ei skildring av problemet og naudsynte steg for å reprodusera problemet.">
 <!ENTITY zotero.errorReport.notReviewed "Feilrapportar vert vanlegvis ikkje kommentert, dersom problemet ikkje vert teke opp i foruma.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Du har installert ein ny versjon av Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Zotero-databasen din må oppgraderast for å fungera med den nye versjonen.">
 <!ENTITY zotero.upgrade.autoBackup "Det vert laga ein tryggleikskopi av den eksisterande databasen før han vert oppgradert.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Rettar">
 <!ENTITY zotero.items.dateAdded_column "Lagt til">
 <!ENTITY zotero.items.dateModified_column "Sist endra">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Vis i bibliotek">
 <!ENTITY zotero.items.menu.attach.note "Legg til notat">
@@ -70,7 +88,7 @@
 <!ENTITY zotero.items.menu.duplicateItem "Dupliser det valde elementet">
 <!ENTITY zotero.items.menu.mergeItems "Slå saman element…">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "Velj kva versjon som skal vere utgangspunkt:">
 <!ENTITY zotero.duplicatesMerge.fieldSelect "Velj felt som skal behaldast frå andre versjonar av elementet:">
 
 <!ENTITY zotero.toolbar.newItem.label "Nytt element">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Gøyr om tekst">
 <!ENTITY zotero.item.textTransform.titlecase "Tittel-format">
 <!ENTITY zotero.item.textTransform.sentencecase "Store bokstavar etter setningsreglar">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nytt notat">
 <!ENTITY zotero.toolbar.note.standalone "Nytt notat">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Vel synleg">
 <!ENTITY zotero.tagSelector.clearVisible "Slepp synleg">
 <!ENTITY zotero.tagSelector.clearAll "Slepp alle">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Gje tagg nytt namn …">
 <!ENTITY zotero.tagSelector.deleteTag "Slett tagg …">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Skriv inn ISBN, DOI eller PMID i feltet for å slå opp.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Vel element">
 <!ENTITY zotero.selectitems.intro.label "Vel kva for einingar du vil leggja til biblioteket ditt">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Merke som ikkje er kryssa av vert ikkje lagra.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Dette merket vert sletta frå alle elementa.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Mellomtenar attkjend">
 <!ENTITY zotero.proxy.recognized.warning "Legg berre til mellomtenarar lenkja til frå biblioteket, skulen eller arbeidsstaden din">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Å leggja til andre mellomtenarar kan la vondsinna nettstader forkle seg som nettstader du stolar på.">
diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties
index 323a4e3faf..d0184ad281 100644
--- a/chrome/locale/nn-NO/zotero/zotero.properties
+++ b/chrome/locale/nn-NO/zotero/zotero.properties
@@ -14,8 +14,11 @@ general.restartLater=Start om seinare
 general.restartApp=Restart %S
 general.errorHasOccurred=Ein feil oppstod.
 general.unknownErrorOccurred=Ein ukjend feil oppstod.
-general.restartFirefox=Ver god og start Firefox om att.
-general.restartFirefoxAndTryAgain=Start Firefox om att og prøv på nytt.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
+general.restartFirefox=Ver god og start %S om att.
+general.restartFirefoxAndTryAgain=Start %S om att og prøv på nytt.
 general.checkForUpdate=Sjå etter oppdatering
 general.actionCannotBeUndone=Dette kan ikkje angrast.
 general.install=Installer
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Sjå %S for meir informasjon
 general.enable=Slå på
 general.disable=Slå av
 general.remove=Fjern
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Ei Zotero-handling foregår
 general.operationInProgress.waitUntilFinished=Please wait until it vert hatt finished.
@@ -56,25 +63,45 @@ upgrade.failed=Oppgradering av Zotero-databasen mislukkast:
 upgrade.advanceMessage=Vel %S for å oppgradera no.
 upgrade.dbUpdateRequired=Zotero-databasen må oppgraderast.
 upgrade.integrityCheckFailed=Zotero-databasen må reparerast før oppgraderinga kan halde fram.
-upgrade.loadDBRepairTool=Load Database Repair Tool
-upgrade.couldNotMigrate=Zotero could not migrate all necessary files.\nPlease close any open attachment files and restart %S to try the upgrade again.
-upgrade.couldNotMigrate.restart=If you continue to receive this message, restart your computer.
+upgrade.loadDBRepairTool=Last databasereparasjonsverktøy
+upgrade.couldNotMigrate=Zotero kunne ikkje oppdatere alle dei nødvendige filene.\nLukk alle opne vedlegg, start %S om att, og prøv å oppdatere igjen.
+upgrade.couldNotMigrate.restart=Dersom du held fram me å få denne meldinga, så start om att maskina di.
 
 errorReport.reportError=Meld frå om feil …
 errorReport.reportErrors=Meld frå om feil …
 errorReport.reportInstructions=Du kan rapportera denne feilen ved å velja "%S" frå Handling-menyen (tannhjulet).
-errorReport.followingErrors=The following errors have occurred since starting %S:
+errorReport.followingErrors=Følgjande feil har oppstått etter start av %S:
 errorReport.advanceMessage=Vel %S for å senda ein feilrapport til Zotero-utviklarane.
 errorReport.stepsToReproduce=Trinn for å reprodusera feilen:
 errorReport.expectedResult=Forventa resultat:
 errorReport.actualResult=Faktisk resultat:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Zoteros datamappe vart ikkje funnet.
 dataDir.previousDir=Førre mappe:
-dataDir.useProfileDir=Bruk profilmappa til Firefox
+dataDir.useProfileDir=Bruk profilmappa til %S
 dataDir.selectDir=Vel ei datamappe
 dataDir.selectedDirNonEmpty.title=Mappa er ikkje tom
 dataDir.selectedDirNonEmpty.text=Mappa du valde er ikkje tom og ser ikkje ut til å vera ei Zotero-datamappe.\n\nSkal Zotero likevel oppretta datafiler i denne mappa?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=Dette ser ut til å vera fyrste gongen du brukar %1$S. Skal %1$S importera innstillingar frå %2$S og bruka eksisterande datamappe?
 dataDir.standaloneMigration.multipleProfiles=%1$S vil dela datamappa si med den mest brukte profilen.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Nytt lagra søk
 pane.collections.savedSearchName=Oppgje namn på dette lagra søket:
 pane.collections.rename=Gje samlinga nytt namn:
 pane.collections.library=Biblioteket mitt
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Søppelbøtte
 pane.collections.untitled=Utan tittel
 pane.collections.unfiled=Usorterte
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Er du sikker på at du vil sletta denne taggen?\
 pane.tagSelector.numSelected.none=0 taggar valt
 pane.tagSelector.numSelected.singular=%S tagg valt
 pane.tagSelector.numSelected.plural=%S taggar valt
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Lastar elementliste …
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Flytt til søppelkorga
 pane.items.trash=Er du sikker på at du vil flytta den valde oppføringa til søppelkorga?
 pane.items.trash.multiple=Er du sikker på at du vil flytta dei valde oppføringane til søppelkorga?
@@ -160,8 +194,8 @@ pane.items.menu.reindexItem=Registrer elementet på nytt
 pane.items.menu.reindexItem.multiple=Registrer elementa på nytt
 pane.items.menu.recognizePDF=Hent metadata frå PDF
 pane.items.menu.recognizePDF.multiple=Les metadata frå PDFar
-pane.items.menu.createParent=Create Parent Item from Selected Item
-pane.items.menu.createParent.multiple=Create Parent Items from Selected Items
+pane.items.menu.createParent=Lag forelderelement av valt element
+pane.items.menu.createParent.multiple=Lag forelderelement av valte element
 pane.items.menu.renameAttachments=Omdøyp fil etter foreldermetadata
 pane.items.menu.renameAttachments.multiple=Omdøyp filer etter foreldermetadata
 
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S element er valde
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Endre elementtype
 pane.item.changeType.text=Vil du verkeleg forandra elementtypen?\n\nDei følgjande vil bli sletta:
@@ -205,18 +244,19 @@ pane.item.attachments.count.zero=%S vedlegg:
 pane.item.attachments.count.singular=%S vedlegg:
 pane.item.attachments.count.plural=%S vedlegg:
 pane.item.attachments.select=Vel ei fil
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=Klikk her
-pane.item.tags=Taggar:
 pane.item.tags.count.zero=%S taggar:
 pane.item.tags.count.singular=%S tagg:
 pane.item.tags.count.plural=%S taggar:
 pane.item.tags.icon.user=Brukerdefinert tagg:
 pane.item.tags.icon.automatic=Automatisk tagg:
-pane.item.related=Relatert:
 pane.item.related.count.zero=%S relaterte:
 pane.item.related.count.singular=%S relatert:
 pane.item.related.count.plural=%S relaterte:
-pane.item.parentItem=Parent Item:
+pane.item.parentItem=Forelderelement:
 
 noteEditor.editNote=Rediger notat
 
@@ -286,7 +326,7 @@ itemFields.distributor=Distributør
 itemFields.extra=Ekstra
 itemFields.journalAbbreviation=Tidsskriftforkorting
 itemFields.DOI=DOI
-itemFields.accessDate=Aksessert
+itemFields.accessDate=Lest
 itemFields.seriesTitle=Serietittel
 itemFields.seriesText=Serietekst
 itemFields.seriesNumber=Serienummer
@@ -363,7 +403,7 @@ itemFields.bookTitle=Boktittel
 itemFields.shortTitle=Kort tittel
 itemFields.docketNumber=Docket Number
 itemFields.numPages=tal sider
-itemFields.programTitle=Program Title
+itemFields.programTitle=Programtittel
 itemFields.issuingAuthority=Issuing Authority
 itemFields.filingDate=Filing Date
 itemFields.genre=Genre
@@ -375,7 +415,7 @@ creatorTypes.editor=Redaktør
 creatorTypes.translator=Omsetjar
 creatorTypes.seriesEditor=Serieredaktør
 creatorTypes.interviewee=Intervju med
-creatorTypes.interviewer=Intervju
+creatorTypes.interviewer=Intervjuar
 creatorTypes.director=Instruktør
 creatorTypes.scriptwriter=Manusforfattar
 creatorTypes.producer=Produsent
@@ -407,40 +447,42 @@ fileTypes.video=Video
 fileTypes.presentation=Presentasjon
 fileTypes.document=Dokument
 
-save.attachment=Saving Snapshot…
+save.attachment=Lagrar augneblinksbilete…
 save.link=Lagrar lenkje …
 save.link.error=Ein feil oppstod ved lagring av lenkja.
 save.error.cannotMakeChangesToCollection=You cannot make changes to the currently selected collection.
 save.error.cannotAddFilesToCollection=You cannot add files to the currently selected collection.
 
 ingester.saveToZotero=Lagre i Zotero
-ingester.saveToZoteroUsing=Save to Zotero using "%S"
+ingester.saveToZoteroUsing=Lagrar til Zotero med «%S»
 ingester.scraping=Lagrar element …
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Element lagra.
 ingester.scrapeError=Kunne ikkje lagra element.
 ingester.scrapeErrorDescription=Ein feil oppstod medan dette elementet vart freista lagra. Sjå %S for meir informasjon.
 ingester.scrapeErrorDescription.linkText=Kjende feil med omsetjaren
 ingester.scrapeErrorDescription.previousError=Lagring mislukkast på grunn av ein føregåande feil.
 
-ingester.importReferRISDialog.title=Zotero RIS/Refer Import
+ingester.importReferRISDialog.title=Zotero RIS/Refer-import
 ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into Zotero?\n\nYou can disable automatic RIS/Refer import in the Zotero preferences.
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Importer fil
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
 
 db.dbCorrupted=Zotero-databasen '%S' ser ut til å vera skadd.
-db.dbCorrupted.restart=Start Firefox på nytt for å freista ein automatisk gjenoppretting frå den siste tryggleikskopien.
+db.dbCorrupted.restart=Start %S om att for å freista ein automatisk gjenoppretting frå den siste tryggleikskopien.
 db.dbCorruptedNoBackup=Zotero-databasen '%S' ser ut til å vera skadd, og ingen automatisk tryggleikkopi er tilgjengeleg.\n\nEn ny database er generert. Den skadde fila vart lagra i Zotero-mappa di.
 db.dbRestored=Zotero-databasen '%1$S' ser ut til å vera skadd.\n\nDataene dine vart gjenoppretta frå den siste automatiske tryggleikskopien, generert %3$S, den %2$S. Den skadde fila vart lagra i Zotero-mappa di.
 db.dbRestoreFailed=Zotero-databasen '%S' ser ut til å vera skadd, og eit forsøk på å gjenopprette frå siste tryggleikkopi mislukkast.\n\nEn ny database har vorte generert. Den skadde fila vart lagra i Zotero-mappa.
 
 db.integrityCheck.passed=Ingen feil vart funne i databasen.
 db.integrityCheck.failed=Det er oppdaga feil i Zotero-databasen!
-db.integrityCheck.dbRepairTool=You can use the database repair tool at http://zotero.org/utils/dbfix to attempt to correct these errors.
+db.integrityCheck.dbRepairTool=Du kan freista å bruka databasereparasjonsverktøyet på http://zotero.org/utils/dbfix for å retta på desse feila.
 db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
 db.integrityCheck.appRestartNeeded=%S will need to be restarted.
 db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=S "resolvers" funne
 zotero.preferences.openurl.resolversFound.singular=S "resolver" funne
 zotero.preferences.openurl.resolversFound.plural=S "resolvers" funne
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Generer register på nytt
 zotero.preferences.search.rebuildWarning=Vil du generera registret på nytt? Dette kan ta eit bel.\n\nHvis du berre vil registrera element som ikkje allereie er registrert, bruk %S.
 zotero.preferences.search.clearIndex=Tøm registret
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Alle nye eller endra om
 zotero.preferences.advanced.resetStyles=Nullstill stilar
 zotero.preferences.advanced.resetStyles.changesLost=Alle nye eller endra stilar vert fjerna.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Dei følgjande filene fanst allereie i målmappa og vart ikkje kopierte:
 dragAndDrop.filesNotFound=Dei følgjande filene vart ikkje funne og kunne ikkje kopierast:
 
@@ -500,15 +559,20 @@ fileInterface.import=Importer
 fileInterface.export=Eksportar
 fileInterface.exportedItems=Eksporterte element
 fileInterface.imported=Importert
-fileInterface.fileFormatUnsupported=Ingen omsetjar vart funnen for den gjeldande fila.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Bibliografi utan tittel
 fileInterface.bibliographyHTMLTitle=Bibliografi
 fileInterface.importError=Ein feil oppstod under importeringa av den valde fila. Du bør forsikra deg om at fila er gyldig før du prøver igjen.
-fileInterface.importClipboardNoDataError=No importable data could be read from the clipboard.
+fileInterface.importClipboardNoDataError=Kunne ikkje lesa noko importerbart data frå utklippstavla.
 fileInterface.noReferencesError=Elementa du valde inneheld ingen referansar. Vel ein eller fleire referansar og prøv igjen.
 fileInterface.bibliographyGenerationError=Ein feil oppstod under genereringa av bibliografien. Prøv igjen.
 fileInterface.exportError=Ein feil oppstod under eksporteringa av den valde fila.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Avansert søkemodus — trykk Enter for å søkja.
 searchInProgress=Søk pågår — vennligst vent.
 
@@ -525,7 +589,7 @@ searchOperator.isInTheLast=er i den siste
 
 searchConditions.tooltip.fields=Felt:
 searchConditions.collection=Samling
-searchConditions.savedSearch=Saved Search
+searchConditions.savedSearch=Lagra søk
 searchConditions.itemTypeID=Elementtype
 searchConditions.tag=Tagg
 searchConditions.note=Notat
@@ -534,9 +598,9 @@ searchConditions.creator=Namn
 searchConditions.type=Type
 searchConditions.thesisType=Avhandlingstype
 searchConditions.reportType=Rapporttype
-searchConditions.videoRecordingFormat=Video Recording Format
+searchConditions.videoRecordingFormat=Videoopptaksformat
 searchConditions.audioFileType=Lydfil-type
-searchConditions.audioRecordingFormat=Audio Recording Format
+searchConditions.audioRecordingFormat=Lydopptaksformat
 searchConditions.letterType=Brevtype
 searchConditions.interviewMedium=Intervjumedium
 searchConditions.manuscriptType=Manuskripttype
@@ -606,23 +670,24 @@ integration.revert.title=Are you sura you want to revert this edit?
 integration.revert.body=If you choose to continue, the text of the bibliography entries corresponded to the selected item(s) will be replaced with the unmodified text specified by the selected style.
 integration.revert.button=Revert
 integration.removeBibEntry.title=The selected reference is cited within your document.
-integration.removeBibEntry.body=Are you sure you want to omit it from your bibliography?
+integration.removeBibEntry.body=Er du sikker på at du vil utelata det frå bibliografien din?
 
-integration.cited=Cited
-integration.cited.loading=Loading Cited Items…
+integration.cited=Sitert
+integration.cited.loading=Lastar siterte element…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Blank Citation
 integration.emptyCitationWarning.body=The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
+integration.openInLibrary=Open in %S
 
-integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_vERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
+integration.error.incompatibleVersion=Denne versjonen av Zotero teksthandsamingsinnstikket ($INTEGRATION_VERSION) er ikkje kompatibelt med noverande installasjon av Zotero (%1$S). Sjekk at du brukar siste versjon av båe to.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or lèt. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Error
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Zotero kunne ikkje lasta inn komponenten som trengs for å kommunisere med teksthandsamingsprogrammet ditt. Sjekk att teksthandsamingsinnstikket er installert og prøv om att.
 integration.error.generic=Zotero experienced an error updating your document.
 integration.error.mustInsertCitation=You must insert a citation before performing this operation.
-integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
+integration.error.mustInsertBibliography=Du må leggja til ein bibliografi før du kan utføra denne handlinga.
 integration.error.cannotInsertHere=Zotero fields cannot be inserted here.
-integration.error.notInCitation=You must place the cursor in a Zotero citation to edit it.
+integration.error.notInCitation=Du må plassera peikaren på eit Zotero-sitat for å endra det.
 integration.error.noBibliography=The current bibliographic style does not define a bibliography. If you wish to add a bibliography, please choose another style.
 integration.error.deletePipe=The pipe that Zotero uses to communicate with the word processor could not be initialized. Would you like Zotero to attempt to correct this error? You will be prompted for your password.
 integration.error.invalidStyle=The style you have selected does not appear to be valid. If you have created this style yourself, please ensure that it passes validation as described at https://github.com/citation-style-language/styles/wiki/Validation. Alternatively, try selecting another style.
@@ -634,7 +699,7 @@ integration.missingItem.multiple=Item %1$S in the highlighted citation no longer
 integration.missingItem.description=Clicking "No" will delete the field codes for citations containing this item, preserving the citation text but deleting it from your bibliography.
 integration.removeCodesWarning=Removing field codes will prevent Zotero from updating citations and bibliographies in this document. Are you sura you want to continue?
 integration.upgradeWarning=Your document must be permanently upgraded in ordar to work with Zotero 2.0b7 or lèt. It is recommended that you make a backup before proceeding. Are you sura you want to continue?
-integration.error.newerDocumentVersion=Your document was created with a newer version of Zotero (%1$S) than the currently installed version (%1$S). Please upgrade Zotero before editing this document.
+integration.error.newerDocumentVersion=Dokumentet ditt vart laga med ein nyare versjon av Zotero (%1$S) enn den noverande installerte versjonen (%1$S). Ver god å oppdatera Zotero før du redigerar dokumentet.
 integration.corruptField=The Zotero field code corresponding to this citation, which tells Zotero which item in your library this citation represents, havast been corrupted. Would you like to reselect the item?
 integration.corruptField.description=Clicking "No" will delete the field codes for citations containing this item, preserving the citation text but potentially deleting it from your bibliography.
 integration.corruptBibliography=The Zotero field code for your bibliography is corrupted. Should Zotero clear this field code and generate a new bibliography?
@@ -643,15 +708,23 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
-styles.installStyle=Installera stilen "%1$S" frå %2$S?
-styles.updateStyle=Oppdatera den eksisterande stilen "%1$S" til "%2$S" frå %3$S?
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
+styles.installStyle=Vil du installera stilen «%1$S» frå %2$S?
+styles.updateStyle=Vil du oppdatera stilen «%1$S» til «%2$S» frå %3$S?
 styles.installed=Installasjon av stilen "%S" var vellukka.
-styles.installError=%S does not appear to be a valid style file.
+styles.installError=%S ser ikkje ut til å vere ei gyldig stilfil.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL fila at %2$S as its source.
-styles.deleteStyle=Are you sure you want to delete the style "%1$S"?
+styles.deleteStyle=Er du sikker på at du vil slette stilen «%1$S»?
 styles.deleteStyles=Are you sure you want to delete the selected style?
 
-sync.cancel=Cancel Sync
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
+sync.cancel=Avbryt synkronisering
 sync.openSyncPreferences=Open Sync Preferences
 sync.resetGroupAndSync=Reset Group and Sync
 sync.removeGroupsAndSync=Remove Groups and Sync
@@ -660,51 +733,97 @@ sync.remoteObject=Remote Object
 sync.mergedObject=Merged Object
 
 sync.error.usernameNotSet=Username not set
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 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 %S.
+sync.error.invalidLogin=Ugyldig brukarnamn eller passord
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
+sync.error.enterPassword=Skriv inn passord.
+sync.error.loginManagerCorrupted1=Zotero får ikkje tilgang til brukaropplysningane dine, truleg på grunn av ein øydelagt %S brukaropplysningsdatabase.
+sync.error.loginManagerCorrupted2=Lukk %1$S, ta kopi av og slett signons* frå %2$S-profilen, og skriv inn att brukaropplysningane dine i synkroniseringsdelen av Zotero-innstillingane.
+sync.error.syncInProgress=Ei synkronisering er allereie i gang.
+sync.error.syncInProgress.wait=Vent til den førre synkroniseringa er ferdig eller start om att %S.
 sync.error.writeAccessLost=You no longer have write access to the Zotero group '%S', and vert filte 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 it sine 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.error.manualInterventionRequired=Automatisk synkronisering førte til ei konflikt som treng manuell løysing.
+sync.error.clickSyncIcon=Trykk på synkroniseringsikonet for å synkronisere manuelt.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
 
-sync.status.notYetSynced=Not yet synced
-sync.status.lastSync=Last sync:
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
+
+sync.status.notYetSynced=Ikkje synkronisert enno
+sync.status.lastSync=Siste synkronisering:
 sync.status.loggingIn=Logging in to sync servar
-sync.status.gettingUpdatedData=Getting updated data from sync server
+sync.status.gettingUpdatedData=Får oppdaterte data frå synkroniseringstenaren
 sync.status.processingUpdatedData=Processing updated data
-sync.status.uploadingData=Uploading data to sync server
+sync.status.uploadingData=Lastar opp data til synkroniseringstenaren
 sync.status.uploadAccepted=Upload accepted \u2014 waiting for sync server
-sync.status.syncingFiles=Syncing files
+sync.status.syncingFiles=Synkroniserar filer
 
-sync.storage.kbRemaining=%SKB remaining
-sync.storage.filesRemaining=%1$S/%2$S files
+sync.storage.mbRemaining=%SMB remaining
+sync.storage.kbRemaining=%S KB att
+sync.storage.filesRemaining=%1$S/%2$S filer
 sync.storage.none=None
-sync.storage.localFile=Local File
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
+sync.storage.localFile=Lokal fil
 sync.storage.remoteFile=Remote File
-sync.storage.savedFile=Saved File
+sync.storage.savedFile=Lagra fil
 sync.storage.serverConfigurationVerified=Server configuration verified
 sync.storage.fileSyncSetUp=File sync is successfully set up.
-sync.storage.openAccountSettings=Open Account Settings
+sync.storage.openAccountSettings=Opna kontoinnstillingar
 
-sync.storage.error.serverCouldNotBeReached=The server %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.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.serverCouldNotBeReached=Kunne ikkje nå tenaren
+sync.storage.error.permissionDeniedAtAddress=Du har ikkje løyve til å opprette Zotero-mappe på følgjande adresse:
+sync.storage.error.checkFileSyncSettings=Sjekk synkroniseringsinnstillingane for filer eller ta kontakt med tenaradministrator.
 sync.storage.error.verificationFailed=%S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
-sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.fileNotCreated=Fila «%S» kunne ikkje opprettast i «storage»-mappa i Zotero-mappa.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=You no longer have file editing access to the Zotero group '%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.fileUploadFailed=Filopplasting feila.
 sync.storage.error.directoryNotFound=Directory not found
-sync.storage.error.doesNotExist=%S does not exist.
-sync.storage.error.createNow=Do you want to create it now?
+sync.storage.error.doesNotExist=%S finst ikkje.
+sync.storage.error.createNow=Vil du opprette den no?
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
 sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
-sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
+sync.storage.error.webdav.invalidURL=%S er ikkje ein gyldig WebDAV-URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV servar did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A fila upload failed due to insufficient space on the WebDAV server.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero Fila Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1=The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2=The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Save Tag
 sync.longTagFixer.saveTags=Save Tags
@@ -733,16 +859,17 @@ proxies.error.scheme.invalid=The entered proxy scheme is invalid; it would apply
 proxies.notification.recognized.label=Zotero detected that you are accessing this website through a proxy. Would you like to automatically redirect future requests to %1$S through %2$S?
 proxies.notification.associated.label=Zotero automatically associated this site with a previously defined proxy. Future requests to %1$S will be redirected to %2$S.
 proxies.notification.redirected.label=Zotero automatically redirected your request to %1$S through the proxy at %2$S.
-proxies.notification.enable.button=Enable…
+proxies.notification.enable.button=Slå på…
 proxies.notification.settings.button=Proxy Settings…
 proxies.recognized.message=Adding this proxy will allow Zotero to recognize items from it sine pages and will automatically redirect future requests to %1$S through %2$S.
 proxies.recognized.add=Add Proxy
 
 recognizePDF.noOCR=PDF does not contain OCRed text.
-recognizePDF.couldNotRead=Could not read text from PDF.
+recognizePDF.couldNotRead=Kunne ikkje lesa tekst frå PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=Fila not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Close
 
@@ -753,14 +880,27 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(Scanned)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
-locate.online.label=View Online
+locate.online.label=Sjå online
 locate.online.tooltip=Go to this item online
-locate.pdf.label=View PDF
-locate.pdf.tooltip=Open PDF using the selected viewer
-locate.snapshot.label=View Snapshot
+locate.pdf.label=Sjå PDF
+locate.pdf.tooltip=Opna PDF med valt visningsprogram
+locate.snapshot.label=Sjå augneblinksbilete
 locate.snapshot.tooltip=View snapshot for this item
 locate.file.label=View File
 locate.file.tooltip=Open file using the selected viewer
@@ -768,8 +908,8 @@ locate.externalViewer.label=Open in External Viewer
 locate.externalViewer.tooltip=Open file in another application
 locate.internalViewer.label=Open in Internal Viewer
 locate.internalViewer.tooltip=Open file in this application
-locate.showFile.label=Show File
-locate.showFile.tooltip=Open the directory in which this file resides
+locate.showFile.label=Vis fil
+locate.showFile.tooltip=Opna mappa fila er i
 locate.libraryLookup.label=Library Lookup
 locate.libraryLookup.tooltip=Look up this item using the selected OpenURL resolver
 locate.manageLocateEngines=Manage Lookup Engines…
diff --git a/chrome/locale/pl-PL/zotero/about.dtd b/chrome/locale/pl-PL/zotero/about.dtd
index 64503f1cd1..1f884c5167 100644
--- a/chrome/locale/pl-PL/zotero/about.dtd
+++ b/chrome/locale/pl-PL/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Podziękowania:">
 <!ENTITY zotero.about.close "Zamknij">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Więcej informacji o twórcach i podziękowania">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/pl-PL/zotero/preferences.dtd b/chrome/locale/pl-PL/zotero/preferences.dtd
index 38e2b0d646..37be033e76 100644
--- a/chrome/locale/pl-PL/zotero/preferences.dtd
+++ b/chrome/locale/pl-PL/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Domyślna:">
 <!ENTITY zotero.preferences.items "elementów">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Ogólne">
 
@@ -38,7 +39,7 @@
 <!ENTITY zotero.preferences.groups.childNotes "potomne notatki">
 <!ENTITY zotero.preferences.groups.childFiles "potomne zrzuty ekranu i zaimportowane pliki">
 <!ENTITY zotero.preferences.groups.childLinks "potomne linki">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "znaczniki">
 
 <!ENTITY zotero.preferences.openurl.caption "openURL">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Synchronizuj załączniki w Mojej bibliotece za pomocą">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Synchronizuj pliki załączników w grupach bibliotek za pomocą usługi przechowywania Zotero">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Używając usługi przechowywania w Zotero, zgadzasz się na jej">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "warunki i postanowienia">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Pełna synchronizacja z serwerem Zotero">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Połącz lokalne dane Zotero z danymi z serwera synchronizacji, ignorując historię synchronizacji.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Przywróć z serwera Zotero">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Usuń wszystkie dane na serwerze i nadpisz je lokalnymi danymi Zotero.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Wyczyść historię synchronizacji plików">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Wymuś sprawdzenie wszystkich lokalnych załączników na serwerze przechowywania.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Wyczyść...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Nazwa">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Aktualizacja">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Pobierz dodatkowe style...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Skróty klawiaturowe">
@@ -154,13 +162,14 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Jakikolwiek tekst">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Zaawansowane">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Wyszukaj">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Zarządzanie silnikami wyszukiwania">
 <!ENTITY zotero.preferences.locate.description "Opis">
 <!ENTITY zotero.preferences.locate.name "Nazwa">
 <!ENTITY zotero.preferences.locate.locateEnginedescription "Silnik wyszukiwania rozszerza możliwości menu wyszukiwania w panelu informacji. Włączając silniki wyszukiwania na poniższej liście, zostaną one dodane do rozwijanego i mogą zostać użyte do wyszukiwania zasobów z twojej biblioteki w sieci internet.">
-<!ENTITY zotero.preferences.locate.addDescription "Aby dodać silnik wyszukiwania, którego nie ma na liście, odwiedź określony silnik wyszukiwania w przeglądarce i wybierz 'Dodaj' na pasku wyszukiwania Firefoksare. Kiedy otworzysz ponownie ten panel preferencji, pojawi się tam opcja umożliwiająca włączenie nowego silnika wyszukiwania.">
+<!ENTITY zotero.preferences.locate.addDescription "Aby dodać silnik wyszukiwania, którego nie ma na liście, odwiedź określony silnik wyszukiwania w przeglądarce i wybierz 'Dodaj' na pasku wyszukiwania Zotero.">
 <!ENTITY zotero.preferences.locate.restoreDefaults "Przywróć domyślne">
 
 <!ENTITY zotero.preferences.charset "Kodowanie znaków">
@@ -168,11 +177,17 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Wyświetl opcje kodowania znaków przy eksporcie">
 
 <!ENTITY zotero.preferences.dataDir "Miejsce przechowywania:">
-<!ENTITY zotero.preferences.dataDir.useProfile "Użyj katalogu profilu Firefoksa">
+<!ENTITY zotero.preferences.dataDir.useProfile "Użyj katalogu profilu">
 <!ENTITY zotero.preferences.dataDir.custom "Określ katalog:">
 <!ENTITY zotero.preferences.dataDir.choose "Przeglądaj">
 <!ENTITY zotero.preferences.dataDir.reveal "Wyświetl katalog bazy danych">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Konserwacja bazy danych">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Sprawdź spójność bazy danych">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Resetuj translatory i style...">
diff --git a/chrome/locale/pl-PL/zotero/searchbox.dtd b/chrome/locale/pl-PL/zotero/searchbox.dtd
index a67cc0338c..7ef59c6f55 100644
--- a/chrome/locale/pl-PL/zotero/searchbox.dtd
+++ b/chrome/locale/pl-PL/zotero/searchbox.dtd
@@ -5,7 +5,7 @@
 <!ENTITY zotero.search.joinMode.all "wszystkie">
 <!ENTITY zotero.search.joinMode.suffix "z następujących:">
 
-<!ENTITY zotero.search.recursive.label "Szukaj w podkatalogach">
+<!ENTITY zotero.search.recursive.label "Szukaj w podkolekcjach">
 <!ENTITY zotero.search.noChildren "Wyświetl tylko elementy główne">
 <!ENTITY zotero.search.includeParentsAndChildren "Zawiera pasujące elementy główne i potomne">
 
diff --git a/chrome/locale/pl-PL/zotero/standalone.dtd b/chrome/locale/pl-PL/zotero/standalone.dtd
index f97303583e..a9c3294201 100644
--- a/chrome/locale/pl-PL/zotero/standalone.dtd
+++ b/chrome/locale/pl-PL/zotero/standalone.dtd
@@ -12,14 +12,14 @@
 
 <!ENTITY fileMenu.label "Plik">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "Zapisz...">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
+<!ENTITY pageSetupCmd.label "Ustawienia strony...">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "Drukuj...">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Zamknij">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Wsparcie i dokumentacja">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Informacje dla pomocy technicznej">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Prześlij swoją opinię...">
diff --git a/chrome/locale/pl-PL/zotero/zotero.dtd b/chrome/locale/pl-PL/zotero/zotero.dtd
index 6758fb1534..242f8702a4 100644
--- a/chrome/locale/pl-PL/zotero/zotero.dtd
+++ b/chrome/locale/pl-PL/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Edytuj">
 <!ENTITY zotero.general.delete "Usuń">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Wykaz błędów może zawierać informacje nie związane z Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Proszę czekać... Informacje o błędzie są wysyłane.">
 <!ENTITY zotero.errorReport.submitted "Informacje o błędzie zostały wysłane.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Proszę wysłać informację na forum Zotero (forums.zotero.org) z podaniem tego ID raportu, opisem problemu oraz wszystkmi krokami niezbędnymi do powtórzenia błędu.">
 <!ENTITY zotero.errorReport.notReviewed "Raporty błędów nie są zwykle przeglądane, jeśli nie zostaną zamieszczone na forum.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Nowa wersja Zotero została zainstalowana.">
 <!ENTITY zotero.upgrade.upgradeRequired "Baza danych Zotero musi zostać zaktualizowana, aby współpracowała z nową wersją programu.">
 <!ENTITY zotero.upgrade.autoBackup "Przed wprowadzeniem zmian automatycznie zostanie utworzona kopia zapasowa istniejącej bazy danych.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Prawa autorskie">
 <!ENTITY zotero.items.dateAdded_column "Data dodania">
 <!ENTITY zotero.items.dateModified_column "Data modyfikacji">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Wyświetl w bibliotece">
 <!ENTITY zotero.items.menu.attach.note "Dodaj notatkę">
@@ -68,10 +86,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Przywróć do biblioteki">
 <!ENTITY zotero.items.menu.duplicateItem "Duplikuj zaznaczony element">
-<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+<!ENTITY zotero.items.menu.mergeItems "Złącz elementy...">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
-<!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "Wybierz wersję elementu, którą chcesz użyć jako element główny:">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "Wybierz pola, które chcesz zachować z innych wersji elementu:">
 
 <!ENTITY zotero.toolbar.newItem.label "Nowy element">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Więcej">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Przekształć tekst">
 <!ENTITY zotero.item.textTransform.titlecase "Kapitaliki">
 <!ENTITY zotero.item.textTransform.sentencecase "Jak w zdaniu">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nowa notatka">
 <!ENTITY zotero.toolbar.note.standalone "Nowa osobna notatka">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Zaznacz widoczne">
 <!ENTITY zotero.tagSelector.clearVisible "Odznacz widoczne">
 <!ENTITY zotero.tagSelector.clearAll "Odznacz wszystkie">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Zmień nazwę etykiety">
 <!ENTITY zotero.tagSelector.deleteTag "Usuń etykietę">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Wprowadź ISBN, DOI lub PMID aby wyszukać w oknie poniżej.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Zaznacz elementy">
 <!ENTITY zotero.selectitems.intro.label "Zaznacz elementy, które chcesz dodać do biblioteki">
@@ -132,9 +159,9 @@
 
 <!ENTITY zotero.bibliography.title "Utwórz bibliografię">
 <!ENTITY zotero.bibliography.style.label "Styl cytowania:">
-<!ENTITY zotero.bibliography.outputMode "Output Mode:">
-<!ENTITY zotero.bibliography.bibliography "Bibliography">
-<!ENTITY zotero.bibliography.outputMethod "Output Method:">
+<!ENTITY zotero.bibliography.outputMode "Tryb wyjścia:">
+<!ENTITY zotero.bibliography.bibliography "Bibliografia">
+<!ENTITY zotero.bibliography.outputMethod "Metoda wyjścia:">
 <!ENTITY zotero.bibliography.saveAsRTF.label "Zapisz jako RTF">
 <!ENTITY zotero.bibliography.saveAsHTML.label "Zapisz jako HTML">
 <!ENTITY zotero.bibliography.copyToClipboard.label "Kopiuj do schowka">
@@ -143,7 +170,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Ustawienia dokumentu">
 <!ENTITY zotero.integration.addEditCitation.title "Dodaj/Edytuj odnośnik bibliograficzny">
 <!ENTITY zotero.integration.editBibliography.title "Edytuj bibliografię">
-<!ENTITY zotero.integration.quickFormatDialog.title "Quick Format Citation">
+<!ENTITY zotero.integration.quickFormatDialog.title "Szybkie formatowanie cytowania">
 
 <!ENTITY zotero.progress.title "Postęp">
 
@@ -162,7 +189,7 @@
 <!ENTITY zotero.citation.suppressAuthor.label "Ukryj autora">
 <!ENTITY zotero.citation.prefix.label "Prefiks:">
 <!ENTITY zotero.citation.suffix.label "Sufiks:">
-<!ENTITY zotero.citation.editorWarning.label "Warning: If you edit a citation in the editor it will no longer update to reflect changes in your database or the citation style.">
+<!ENTITY zotero.citation.editorWarning.label "Ostrzeżenie: Jeżeli edytujesz cytowanie w edytorze, nie będzie ono więcej aktualizowane z twojej bazy danych ani stylu cytowania.">
 
 <!ENTITY zotero.richText.italic.label "Kursywa">
 <!ENTITY zotero.richText.bold.label "Pogrubienie">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Niezaznaczone etykiety nie będą zachowane.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Etykieta zostanie usunięte ze wszystkich elementów.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Rozpoznano proxy">
 <!ENTITY zotero.proxy.recognized.warning "Dodaj tylko zaufane serwery proxy, powiązane z twoją stroną biblioteki, szkoły lub organizacji. ">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Dodawanie innych serwerów proxy umożliwia złośliwym stronom internetowym podszywanie się pod zaufane.">
diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties
index 0dbb74fedf..ccb868f404 100644
--- a/chrome/locale/pl-PL/zotero/zotero.properties
+++ b/chrome/locale/pl-PL/zotero/zotero.properties
@@ -11,11 +11,14 @@ general.restartRequiredForChange=Aby zastosować zmianę %S musi zostać ponowni
 general.restartRequiredForChanges=Aby zastosować zmiany %S musi zostać ponownie uruchomiony.
 general.restartNow=Uruchom ponownie
 general.restartLater=Uruchom ponownie później
-general.restartApp=Restart %S
+general.restartApp=Uruchom ponownie %S
 general.errorHasOccurred=Wystąpił błąd.
 general.unknownErrorOccurred=Wystąpił nieznany błąd.
-general.restartFirefox=Proszę uruchomić ponownie Firefoksa.
-general.restartFirefoxAndTryAgain=Proszę uruchomić ponownie Firefoksa i spróbować jeszcze raz.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
+general.restartFirefox=Proszę uruchomić ponownie %S.
+general.restartFirefoxAndTryAgain=Proszę uruchomić ponownie %S i spróbować ponownie.
 general.checkForUpdate=Proszę sprawdzić dostępność aktualizacji
 general.actionCannotBeUndone=To polecenie nie może być cofnięte.
 general.install=Zainstaluj
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Zobacz %S aby uzyskać więcej informacji.
 general.enable=Włącz
 general.disable=Wyłącz
 general.remove=Usuń
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Otwórz dokumentację
-general.numMore=%S more…
+general.numMore=%S więcej...
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Operacja Zotero jest aktualnie w trakcie.
 general.operationInProgress.waitUntilFinished=Proszę poczekać na zakończenie.
@@ -57,7 +64,7 @@ upgrade.advanceMessage=Naciśnij %S, aby zaktualizować teraz.
 upgrade.dbUpdateRequired=Baza danych Zotero musi zostać zaktualizowana.
 upgrade.integrityCheckFailed=Twoja baza danych Zotero musi zostać naprawiona zanim aktualizacja będzie mogła być dokończona.
 upgrade.loadDBRepairTool=Wczytaj narzędzie naprawy bazy danych
-upgrade.couldNotMigrate=Zotero nie mógł przenieść wszystkich wymaganych plików.\nZamknij wszystkie otwarte pliki załączników i uruchom ponownie Firefoksa aby spróbować powtórzyć aktualizację.
+upgrade.couldNotMigrate=Zotero nie mógł przenieść wszystkich wymaganych plików.\nZamknij wszystkie otwarte pliki załączników i uruchom ponownie %S aby spróbować powtórzyć aktualizację.
 upgrade.couldNotMigrate.restart=Jeśli ponownie zobaczysz ten komunikat, uruchom ponownie swój komputer.
 
 errorReport.reportError=Zgłoś błąd...
@@ -68,13 +75,33 @@ errorReport.advanceMessage=Naciśnij przycisk %S, aby zgłosić błąd twórcom
 errorReport.stepsToReproduce=Kroki do odtworzenia:
 errorReport.expectedResult=Oczekiwane wyniki:
 errorReport.actualResult=Rzeczywisty rezultat:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Nie można znaleźć katalogu danych Zotero.
 dataDir.previousDir=Poprzedni katalog:
-dataDir.useProfileDir=Użyj katalogu profilu Firefoksa
+dataDir.useProfileDir=Użyj katalogu profilu %S
 dataDir.selectDir=Wybierz katalog danych Zotero
 dataDir.selectedDirNonEmpty.title=Katalog zawiera elementy
 dataDir.selectedDirNonEmpty.text=Wybrany katalog zawiera elementy i nie jest katalogiem danych Zotero.\n\nCzy mimo wszystko chcesz utworzyć pliki Zotero?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Informacja migracji Zotero
 dataDir.standaloneMigration.description=Wygląda na to, że pierwszy raz używasz %1$S. Czy chcesz aby %1$S zaimportował ustawienia z %2$S i użył twojego istniejącego katalogu danych?
 dataDir.standaloneMigration.multipleProfiles=%1$S będzie dzielić swój katalog danych z najczęściej ostatnio używanym profilem.
@@ -114,10 +141,11 @@ pane.collections.newSavedSeach=Nowy wynik wyszukiwania
 pane.collections.savedSearchName=Wprowadź nazwę dla tego wyniku wyszukiwania:
 pane.collections.rename=Zmień nazwę kolekcji:
 pane.collections.library=Moja biblioteka
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Kosz
 pane.collections.untitled=Bez nazwy
 pane.collections.unfiled=Niepowiązane elementy
-pane.collections.duplicate=Duplicate Items
+pane.collections.duplicate=Zduplikowane elementy
 
 pane.collections.menu.rename.collection=Zmień nazwę kolekcji
 pane.collections.menu.edit.savedSearch=Edytuj wynik wyszukiwania
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Czy na pewno chcesz usunąć tę etykietę?\n\nE
 pane.tagSelector.numSelected.none=Nie wybrano etykiet
 pane.tagSelector.numSelected.singular=Wybrano %S etykietę
 pane.tagSelector.numSelected.plural=Wybrano %S etykiet(y)
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Wczytywanie listy elementów...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Przenieś do Kosza
 pane.items.trash=Czy na pewno przenieść zaznaczony element do Kosza?
 pane.items.trash.multiple=Czy na pewno przenieść zaznaczone elementy do Kosza?
@@ -176,10 +210,15 @@ pane.items.interview.manyParticipants=Prowadzący wywiad %S et al.
 
 pane.item.selected.zero=Nie wybrano elementu
 pane.item.selected.multiple=Wybrano %S elementy(ów)
-pane.item.unselected.zero=No items in this view
-pane.item.unselected.singular=%S item in this view
-pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+pane.item.unselected.zero=Brak elementów w tym widoku
+pane.item.unselected.singular=%S element w tym widoku
+pane.item.unselected.plural=%S elementów w tym widoku
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Zmień typ elementu
 pane.item.changeType.text=Czy na pewno chcesz zmienić typ elementu?\n\nZostaną utracone następujące pola:
@@ -188,8 +227,8 @@ pane.item.defaultLastName=Nazwisko
 pane.item.defaultFullName=Imię i nazwisko
 pane.item.switchFieldMode.one=Przełącz na pojedyncze pole
 pane.item.switchFieldMode.two=Przełącz na dwa pola
-pane.item.creator.moveUp=Move Up
-pane.item.creator.moveDown=Move Down
+pane.item.creator.moveUp=Przenieś do góry
+pane.item.creator.moveDown=Przenieś w dół
 pane.item.notes.untitled=Notatka bez tytułu
 pane.item.notes.delete.confirm=Czy na pewno chcesz usunąć tę notatkę?
 pane.item.notes.count.zero=Brak notatek
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=Brak załączników
 pane.item.attachments.count.singular=%S załącznik
 pane.item.attachments.count.plural=%S załączniki(ów)
 pane.item.attachments.select=Wybierz plik
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=kliknij tutaj
-pane.item.tags=Etykiety:
 pane.item.tags.count.zero=Brak etykiet
 pane.item.tags.count.singular=%S etykieta
 pane.item.tags.count.plural=%S etykiet(y)
 pane.item.tags.icon.user=Etykieta dodana przez użytkownika
 pane.item.tags.icon.automatic=Etykieta dodana automatycznie
-pane.item.related=Powiązane:
 pane.item.related.count.zero=Brak powiązanych
 pane.item.related.count.singular=%S powiązany
 pane.item.related.count.plural=%S powiązane(ych)
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Nie możesz dodać plików do aktualnie wy
 ingester.saveToZotero=Zapisz w Zotero
 ingester.saveToZoteroUsing=Zapisz w Zotero używając "%S"
 ingester.scraping=Zapisywanie elementu...
+ingester.scrapingTo=Saving to
 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.
@@ -428,12 +469,13 @@ ingester.importReferRISDialog.checkMsg=Zawsze pozwalaj tej witrynie
 
 ingester.importFile.title=Importuj plik
 ingester.importFile.text=Czy chcesz zaimportować plik "%S"?\n\nElementy zostaną dodane do nowej kolekcji.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Wyszukiwanie...
 ingester.lookup.error=W trakcie wyszukiwania tego elementu wystąpił błąd.
 
 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.
+db.dbCorrupted.restart=Proszę uruchomić ponownie %S, aby spróbować odzyskać danych z ostatniej kopi zapasowej.
 db.dbCorruptedNoBackup=Baza danych Zotero "%S" jest prawdopodobnie uszkodzona i niemożliwe jest automatyczne odzyskiwanie z kopii zapasowej.\n\nUtworzono nowy plik bazy danych. Uszkodzony plik został zapisany w katalogu Zotero.
 db.dbRestored=Baza danych Zotero "%1$S" jest prawdopodobnie uszkodzona.\n\nDane zostały odtworzone z ostatniej kopii zapasowej utworzonej\n%2$S o godz. %3$S. Uszkodzony plik został zapisany w katalogu Zotero.
 db.dbRestoreFailed=Baza danych Zotero "%S" jest prawdopodobnie uszkodzona.\n\nPróba odtworzenia danych z ostatniej utworzonej kopii zapasowej nie powiodła się.\nUtworzono nowy plik bazy danych. Uszkodzony plik został zapisany w katalogu Zotero.
@@ -441,20 +483,33 @@ db.dbRestoreFailed=Baza danych Zotero "%S" jest prawdopodobnie uszkodzona.\n\nPr
 db.integrityCheck.passed=Baza danych nie zawiera błędów.
 db.integrityCheck.failed=Baza danych Zotero zawiera błędy!
 db.integrityCheck.dbRepairTool=Możesz użyć narzędzia naprawy bazy danych na http://zotero.org/utils/dbfix, aby spróbować skorygować te błędy.
-db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
-db.integrityCheck.appRestartNeeded=%S will need to be restarted.
-db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
-db.integrityCheck.errorsFixed=The errors in your Zotero database have been corrected.
-db.integrityCheck.errorsNotFixed=Zotero was unable to correct all the errors in your database.
-db.integrityCheck.reportInForums=You can report this problem in the Zotero Forums.
+db.integrityCheck.repairAttempt=Zotero może spróbować naprawić te błędy.
+db.integrityCheck.appRestartNeeded=Należy uruchomić ponownie %S .
+db.integrityCheck.fixAndRestart=Napraw błędy i uruchom ponownie %S
+db.integrityCheck.errorsFixed=Błędy w twojej bazie danych Zotero zostały naprawione.
+db.integrityCheck.errorsNotFixed=Nie można było naprawić błędów w twojej bazie danych.
+db.integrityCheck.reportInForums=Możesz przesłać opis tego problemu na Forum Zotero.
 
 zotero.preferences.update.updated=Zaktualizowano
 zotero.preferences.update.upToDate=Aktualne
 zotero.preferences.update.error=Błąd
-zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when possible
+zotero.preferences.launchNonNativeFiles=Otwieraj PDFy i i inne pliki za pomocą %S jeśli to możliwe.
 zotero.preferences.openurl.resolversFound.zero=Nie znaleziono resolwerów
 zotero.preferences.openurl.resolversFound.singular=Znaleziono %S resolwer
 zotero.preferences.openurl.resolversFound.plural=Znaleziono %S resolwery(ów)
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Odbuduj indeks
 zotero.preferences.search.rebuildWarning=Czy chcesz odbudować cały indeks? Może to potrwać chwilę.\n\nAby zindeksować elementy, które nie zostały jeszcze zindeksowane, użyj %S.
 zotero.preferences.search.clearIndex=Wyczyść indeks
@@ -481,7 +536,7 @@ zotero.preferences.search.pdf.tryAgainOrViewManualInstructions=Proszę spróbowa
 zotero.preferences.export.quickCopy.bibStyles=Style bibliograficzne
 zotero.preferences.export.quickCopy.exportFormats=Eksportuj formaty
 zotero.preferences.export.quickCopy.instructions=Szybka kopia pozwala na skopiowanie wybranych pozycji bibliograficznych do schowka poprzez użycie skrótu klawiaturowego (%S) lub poprzez przeciągnięcie elementu w obszar pola tekstowego na stronie internetowej.
-zotero.preferences.export.quickCopy.citationInstructions=For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
+zotero.preferences.export.quickCopy.citationInstructions=W przypadku stylów bibliograficznych możesz skopiować cytowania lub przypisy wciskając %S lub przytrzymując klawisz Shift przed ich przeciągnięciem.
 zotero.preferences.styles.addStyle=Dodaj styl
 
 zotero.preferences.advanced.resetTranslatorsAndStyles=Resetuj translatory i style
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Nowe lub zmodyfikowane
 zotero.preferences.advanced.resetStyles=Resetuj style
 zotero.preferences.advanced.resetStyles.changesLost=Nowe lub zmodyfikowane style zostaną utracone.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Następujące pliki istnieją już w katalogu docelowym i nie zostały skopiowane:
 dragAndDrop.filesNotFound=Następujących plików nie znaleziono i nie mogą zostać skopiowane:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importuj
 fileInterface.export=Eksportuj
 fileInterface.exportedItems=Elementy eksportowane
 fileInterface.imported=Elementy importowane
-fileInterface.fileFormatUnsupported=Nie znaleziono translatora dla tego pliku
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Bibliografia bez tytułu
 fileInterface.bibliographyHTMLTitle=Bibliografia
 fileInterface.importError=Podczas próby importowania wybranego pliku wystąpił błąd. Proszę sprawdzić, czy plik jest prawidłowy i spróbować ponownie.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Wybrany element nie zawiera pozycji bibliografic
 fileInterface.bibliographyGenerationError=Podczas generowanie bibliografii wystąpił błąd. Proszę spróbować ponownie.
 fileInterface.exportError=Podczas próby wyeksportowania wybranego pliku wystąpił błąd.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Wyszukiwanie zaawansowane - naciśnij Enter, by rozpocząć wyszukiwanie
 searchInProgress=Trwa wyszukiwanie... Proszę czekać.
 
@@ -556,7 +620,7 @@ fulltext.indexState.partial=Częściowy
 
 exportOptions.exportNotes=Eksportuj notatki
 exportOptions.exportFileData=Eksportuj pliki
-exportOptions.useJournalAbbreviation=Use Journal Abbreviation
+exportOptions.useJournalAbbreviation=Użyj skrótu czasopisma
 charset.UTF8withoutBOM=Unicode (UTF-8 bez BOM)
 charset.autoDetect=(automatyczne wykrycie)
 
@@ -572,8 +636,8 @@ citation.multipleSources=Wiele źródeł
 citation.singleSource=Pojedyncze źródło
 citation.showEditor=Wyświetl redaktora
 citation.hideEditor=Ukryj redaktora
-citation.citations=Citations
-citation.notes=Notes
+citation.citations=Cytowania
+citation.notes=Notatki
 
 report.title.default=Raport Zotero
 report.parentItem=Element nadrzędny:
@@ -613,11 +677,12 @@ integration.cited.loading=Wczytywanie cytowanych elementów...
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Puste cytowanie
 integration.emptyCitationWarning.body=Wybrane cytowanie będzie puste w aktualnie wybranym stylu. Czy na pewno je dodać?
+integration.openInLibrary=Open in %S
 
-integration.error.incompatibleVersion=Ta wersja wtyczki edytora tekstu ($INTEGRATION_VERSION) nie jest kompatybilna z aktualnie zainstalowaną wersją rozszerzenia Zotero do Firefoksa (%1$S). Upewnij się, że używasz najnowszych wersji obu składników.
+integration.error.incompatibleVersion=Ta wersja wtyczki edytora tekstu Zotero ($INTEGRATION_VERSION) jest niezgodna z aktualnie zainstalowaną wersją Zotero (%1$S). Upewnij się, że używasz najnowszych wersji obu składników.
 integration.error.incompatibleVersion2=Zotero %1$S wymaga %2$S %3$S lub nowszego. Proszę pobrać najnowszą wersję %2$S z witryny zotero.org.
 integration.error.title=Błąd integracji Zotero
-integration.error.notInstalled=Firefox nie może wczytać składnika wymaganego do komunikacji z twoim procesorem tekstu. Proszę się upewnić, że odpowiedni dodatek Firefoksa jest zainstalowany, a następnie spróbować ponownie.
+integration.error.notInstalled=Zotero nie może wczytać składnika wymaganego do komunikacji z twoim procesorem tekstu. Proszę się upewnić, że odpowiedni dodatek jest zainstalowany, a następnie spróbować ponownie.
 integration.error.generic=Wystąpił błąd podczas aktualizacji twojego dokumentu.
 integration.error.mustInsertCitation=Musisz wstawić cytowanie przed wykonaniem tej operacji.
 integration.error.mustInsertBibliography=Musisz wstawić bibliografię przed wykonaniem tej operacji.
@@ -643,14 +708,22 @@ integration.citationChanged=Dokonano modyfikacji tego odnośnika, zanim Zotero j
 integration.citationChanged.description=Wybranie "Tak" spowoduje, że Zotero nie zaktualizuje tego odnośnika jeśli dodasz dodatkowe źródła, zmienisz styl lub zmodyfikujesz pozycję, do której się on odnosi. Wybranie "Nie" usunie Twoje zmiany.
 integration.citationChanged.edit=Dokonano modyfikacji tego odnośnika, zanim Zotero je utworzył. Edycja usunie twoje modyfikacje. Czy chcesz kontynuować?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Zainstalować styl "%1$S" z %2$S?
 styles.updateStyle=Czy zastąpić istniejący styl "%1$S" stylem "%2$S" pobranym z %3$S?
 styles.installed=Styl "%S" został zainstalowany.
 styles.installError=%S nie jest poprawnym stylem.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S w %2$S odsyła do nieprawidłowego lub nieistniejącego pliku CSL jako swojego źródła.
 styles.deleteStyle=Czy na pewno usunąć styl "%1$S"?
 styles.deleteStyles=Czy na pewno usunąć wybrane style?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Anulowanie synchronizacji
 sync.openSyncPreferences=Otwórz ustawienia synchronizacji...
 sync.resetGroupAndSync=Przywróć grupy i synchronizuj
@@ -660,18 +733,55 @@ sync.remoteObject=Obiekt zdalny
 sync.mergedObject=Złączony obiekt
 
 sync.error.usernameNotSet=Nie podano nazwy użytkownika
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Nie podano hasła
 sync.error.invalidLogin=Błędna nazwa użytkownika lub hasło
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Proszę podać hasło.
-sync.error.loginManagerCorrupted1=Zotero nie mógł odczytać nazwy użytkownika oraz hasła Zotero, prawdopodobnie ze względu na uszkodzenie bazy danych menedżera haseł Firefoksa.
-sync.error.loginManagerCorrupted2=Wyłącz Firefoksa, zrób kopie zapasowe oraz usuń pliki signons.* z profilu Firefoksa i wprowadź ponownie dane użytkownika Zotero w karcie Synchronizacja preferencji Zotero.
+sync.error.loginManagerCorrupted1=Zotero nie mógł odczytać twojej nazwy użytkownika oraz hasła, prawdopodobnie ze względu na uszkodzenie bazy danych menedżera haseł %S.
+sync.error.loginManagerCorrupted2=Zamknij %1$S, zrób kopie zapasowe oraz usuń pliki signons.* z twojego profilu %2$S, a następnie wprowadź ponownie swoje dane użytkownika Zotero w karcie Synchronizacja preferencji Zotero.
 sync.error.syncInProgress=Synchronizacja jest aktualnie w trakcie.
-sync.error.syncInProgress.wait=Poczekaj na zakończenie poprzedniej synchronizacji albo uruchom ponownie Firefoksa.
+sync.error.syncInProgress.wait=Poczekaj na zakończenie poprzedniej synchronizacji albo uruchom ponownie %S.
 sync.error.writeAccessLost=Nie masz już prawa zapisu do grupy Zotero '%S', w związku z czym pliki które dodałeś lub zmieniłeś nie mogą być zsynchronizowane z serwerem.
 sync.error.groupWillBeReset=Jeżeli będziesz kontynuować, twoja kopia grupy zostanie przywrócona do stanu na serwerze, a lokalne zmiany pozycji oraz plików zostaną usunięte.
 sync.error.copyChangedItems=Jeżeli chcesz mieć możliwość skopiowania zmienionych elementów w inne miejsce lub chcesz poprosić administratora grupy o prawo do zapisu, anuluj teraz synchronizację.
 sync.error.manualInterventionRequired=Automatyczna synchronizacja spowodowała konflikt, który wymaga ręcznej interwencji.
 sync.error.clickSyncIcon=Naciśnij ikonę synchronizacji aby zsynchronizować ręcznie..
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Nie zsynchronizowany
 sync.status.lastSync=Ostatnia synchronizacja:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Wysyłanie danych na serwer synchronizacji
 sync.status.uploadAccepted=Wysyłanie zaakceptowane \— oczekiwanie na serwer synchronizacji
 sync.status.syncingFiles=Synchronizowanie plików
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=pozostało %SKB
 sync.storage.filesRemaining=%1$S/%2$S plików
 sync.storage.none=Brak
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Plik lokalny
 sync.storage.remoteFile=Plik zdalny
 sync.storage.savedFile=Plik zapisany
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Konfiguracja serwera zweryfikowana.
 sync.storage.fileSyncSetUp=Ustawienia synchronizacji plików zdefiniowano pomyślnie.
 sync.storage.openAccountSettings=Otwórz ustawienia konta
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Nie można osiągnąć serwera %S.
 sync.storage.error.permissionDeniedAtAddress=Nie masz uprawnień do utworzenia katalogu Zotero w adresie:
 sync.storage.error.checkFileSyncSettings=Proszę sprawdzić swoje ustawienia synchronizacji plików lub skontaktować się ze swoim administratorem serwera.
 sync.storage.error.verificationFailed=Weryfikacja %S nie powiodła się. Sprawdź swoje ustawienia synchronizacji plików w panelu Synchronizacja w ustawieniach Zotero.
 sync.storage.error.fileNotCreated=Nie można utworzyć pliku '%S' w katalogu danych Zotero.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Nie masz już prawa modyfikowania plików w grupie '%S', w związku z czym pliki które dodałeś lub zmieniłeś nie mogą być zsynchronizowane z serwerem.
 sync.storage.error.copyChangedItems=Jeśli chcesz mieć możliwość skopiowania zmienionych elementów i plików w inne miejsce, anuluj teraz synchronizację.
 sync.storage.error.fileUploadFailed=Wysyłanie pliku nie powiodło się.
 sync.storage.error.directoryNotFound=Nie znaleziono katalogu
 sync.storage.error.doesNotExist=%S nie istnieje.
 sync.storage.error.createNow=Czy chcesz go teraz utworzyć?
-sync.storage.error.webdav.enterURL=Proszę podać URL WebDAV.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S nie jest poprawnym URL WebDAV.
 sync.storage.error.webdav.invalidLogin=Serwer WebDAV nie zaakceptował podanych przez ciebie nazwy użytkownika i hasła.
 sync.storage.error.webdav.permissionDenied=Nie masz uprawnień dostępu do %S na serwerze WebDAV.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=Błąd połączenia SSL podczas ł
 sync.storage.error.webdav.loadURLForMoreInfo=Wczytaj swój URL WebDAV w przeglądarce aby uzyskać więcej informacji.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Aby uzyskać więcej informacji zobacz dokumentację dotyczącą wymuszenia certyfikatu
 sync.storage.error.webdav.loadURL=Wczytaj URL WebDAV
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Twój limit przechowywania plików w Zotero został osiągnięty. Niektóre pliki nie zostały przesłane. Pozostałe dane Zotero zostaną zsynchronizowane z serwerem.
 sync.storage.error.zfs.personalQuotaReached2=Dla dodatkowych opcji przechowywania plików sprawdź swoje ustawienia konta na zotero.org.
 sync.storage.error.zfs.groupQuotaReached1=Limit przechowywania plików dla grupy '%S' został osiągnięty. Niektóre pliki nie zostały przesłane. Pozostałe dane Zotero zostaną zsynchronizowane z serwerem.
 sync.storage.error.zfs.groupQuotaReached2=Właściciel grupy może zwiększyć pojemność przechowywania dla grupy w sekcji ustawień na zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Zapisz etykietę
 sync.longTagFixer.saveTags=Zapisz etykietę
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Nie można odczytać tekstu z pliku PDF.
 recognizePDF.noMatches=Nie znaleziono pasujących referencji.
 recognizePDF.fileNotFound=Nie znaleziono pliku.
 recognizePDF.limit=Osiągnięto limit zapytania. Spróbuj ponownie później.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Pobieranie metadanych ukończone.
 recognizePDF.close.label=Zamknij
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Wybierz lokalizację, gdzie zapisać sformatowany plik
 rtfScan.scannedFileSuffix=(Przeskanowano)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Wyszukiwanie nieudane
 lookup.failure.description=Zotero nie potrafi odnaleźć wpisu dla podanego identyfikatora. Sprawdź proszę identyfikator i spróbuj ponownie.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Pokaż online
 locate.online.tooltip=Pokaż ten element online
diff --git a/chrome/locale/pt-BR/zotero/about.dtd b/chrome/locale/pt-BR/zotero/about.dtd
index b8fdab350f..d0b974eb01 100644
--- a/chrome/locale/pt-BR/zotero/about.dtd
+++ b/chrome/locale/pt-BR/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Agradecimentos especiais:">
 <!ENTITY zotero.about.close "Fechar">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Mais créditos e reconhecimentos.">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/pt-BR/zotero/preferences.dtd b/chrome/locale/pt-BR/zotero/preferences.dtd
index c7c3ec8b43..011a8ab679 100644
--- a/chrome/locale/pt-BR/zotero/preferences.dtd
+++ b/chrome/locale/pt-BR/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Padrão:">
 <!ENTITY zotero.preferences.items "itens">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Geral">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "Endereço:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Sincronizar arquivos anexos em Minha Biblioteca usando">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Sincronizar arquivos anexos em bibliotecas de grupo usando o armazenamento Zotero">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "Sobre a sincronização do arquivo">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Ao utilizar o armazenamento Zotero, você concorda em aderir a seus">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "termos e condições">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Sincronização completa com o servidor Zotero">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Mesclar os dados locais do Zotero com os dados do servidor de sincronização, ignorando o histórico de sincronização">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Restaurar a partir do servidor Zotero">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Apagar todos os dados do servidor e sobrescrever com os dados locais do Zotero">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Reconfigurar o histórico de sincronização de arquivo">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Forçar a verificação do servidor de armazenagem para todos os arquivos anexos locais.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reconfigurar...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Título">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Atualizado">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Obter estilos aditionais...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Teclas de atalho">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Qualquer texto">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avançado">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Localizar">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Gerenciador dos mecanismos de pesquisa de artigos">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Escolha...">
 <!ENTITY zotero.preferences.dataDir.reveal "Exibir diretório de dados">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Manutenção do banco de dados">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Verificar integridade do banco de dados">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reconfigurar tradutores e estilos...">
diff --git a/chrome/locale/pt-BR/zotero/zotero.dtd b/chrome/locale/pt-BR/zotero/zotero.dtd
index 69ddbf910b..86e4ace55f 100644
--- a/chrome/locale/pt-BR/zotero/zotero.dtd
+++ b/chrome/locale/pt-BR/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Editar">
 <!ENTITY zotero.general.delete "Excluir">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "O registro de erro pode conter mensagens não relacionadas a Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Por favor, aguarde enquanto o relatório de erro é enviado.">
 <!ENTITY zotero.errorReport.submitted "Seu relatório de erro foi enviado.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Por favor, envie uma mensagem para os fóruns Zotero (forums.zotero.org) com o número de identificação do relatório, uma descrição do problema, e quaiquer passos necessários para reproduzi-lo.">
 <!ENTITY zotero.errorReport.notReviewed "Relatórios de erro geralmente não são analisados a não ser que sejam mencionados nos fóruns.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Você instalou uma versão nova de Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Seu banco de dados Zotero deve ser atualizado para funcionar com a nova versão.">
 <!ENTITY zotero.upgrade.autoBackup "Será feita uma cópia de segurança automática de seu banco de dados atual antes que qualquer alteração seja efetivada.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Direitos">
 <!ENTITY zotero.items.dateAdded_column "Adicionado em">
 <!ENTITY zotero.items.dateModified_column "Modificação em">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Mostrar na biblioteca">
 <!ENTITY zotero.items.menu.attach.note "Adicionar nota">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transformar texto">
 <!ENTITY zotero.item.textTransform.titlecase "Iniciais Em Maiúsculo">
 <!ENTITY zotero.item.textTransform.sentencecase "Maiúscula no início da frase">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nova nota">
 <!ENTITY zotero.toolbar.note.standalone "Nova nota standalone">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Marcar visíveis">
 <!ENTITY zotero.tagSelector.clearVisible "Desmarcar visíveis">
 <!ENTITY zotero.tagSelector.clearAll "Desmarcar tudo">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Renomear tag...">
 <!ENTITY zotero.tagSelector.deleteTag "Apagar tag...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Inserir ISBN, DOI, ou PMID para buscar na caixa abaixo">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Selecionar itens">
 <!ENTITY zotero.selectitems.intro.label "Selecionar itens que gostaria de adicionar a sua biblioteca">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Marcadores desmarcados não serão salvos.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "O marcador será excluído de todos os itens.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Proxy reconhecida">
 <!ENTITY zotero.proxy.recognized.warning "Adicionar proxies apenas da sua biblioteca, escola, ou website corporativo.">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Adicionar outras proxies permite que sites maliciosos se passem por sites nos quais você confia.">
diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties
index c6d8e3077c..5a37f23655 100644
--- a/chrome/locale/pt-BR/zotero/zotero.properties
+++ b/chrome/locale/pt-BR/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Reiniciar mais tarde
 general.restartApp=Reiniciar %S
 general.errorHasOccurred=Um erro ocorreu.
 general.unknownErrorOccurred=Um erro desconhecido ocorreu.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Por favor, reinicie o Firefox.
 general.restartFirefoxAndTryAgain=Por favor, reinicie o Firefox e tente novamente.
 general.checkForUpdate=Verificar atualização
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Ver %S para mais informações.
 general.enable=Habilitar
 general.disable=Desabilitar
 general.remove=Remover
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Abrir documentação
 general.numMore=mais %S...
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Uma operação Zotero está atualmente em progresso.
 general.operationInProgress.waitUntilFinished=Por favor, aguarde até que ela termine.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Pressione %S para enviar um relatório de erro para o
 errorReport.stepsToReproduce=Passos para reproduzr:
 errorReport.expectedResult=Resultado experado:
 errorReport.actualResult=Resultado efetivo:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=O diretório de dados Zotero não foi localizado.
 dataDir.previousDir=Diretório anterior:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Usar diretório do perfil do usuário Firefox
 dataDir.selectDir=Selecionar um diretório de dados Zotero
 dataDir.selectedDirNonEmpty.title=Este diretório não está vazio
 dataDir.selectedDirNonEmpty.text=O diretório que você selecionou não está vazio e não parece ser um diretório de dados Zotero.\n\nCriar arquivos Zotero neste diretório mesmo assim?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Encontrada uma biblioteca do Zotero 
 dataDir.standaloneMigration.description=Esta é, aparentemente, a primeira vez que você usa %1$S. Você gostaria que %1$S importasse as configurações de %2$S e utilizasse seu diretório de dados existente?
 dataDir.standaloneMigration.multipleProfiles=%1$S compartilhará seu diretório de dados com o último perfil utilizado.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Nova pesquisa salva
 pane.collections.savedSearchName=Digite um nome para essa pesquisa salva:
 pane.collections.rename=Renomear coleção:
 pane.collections.library=Minha biblioteca
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Lixeira
 pane.collections.untitled=Sem título
 pane.collections.unfiled=Documentos sem coleção
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Tem certeza de que deseja excluir este marcador?
 pane.tagSelector.numSelected.none=0 marcadores selecionados.
 pane.tagSelector.numSelected.singular=%S marcador selecionado
 pane.tagSelector.numSelected.plural=%S marcadores selecionados
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Carregando lista de itens...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Mover para a Lixeira
 pane.items.trash=Tem certeza de que deseja mover o item selecionado para a Lixeira?
 pane.items.trash.multiple=Tem certeza de que deseja mover os itens selecionados para a Lixeira?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S itens selecionados
 pane.item.unselected.zero=Não há ítens a serem mostrados neste modo de exibição.
 pane.item.unselected.singular=%S ítem neste modo de exibição
 pane.item.unselected.plural=%S ítens neste modo de exibição
-pane.item.selectToMerge=Selecione os ítens que deseja fundir
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Mudar tipo do item
 pane.item.changeType.text=Tem certeza de que deseja mudar o tipo do item?\n\nOs campos abaixo serão perdidos:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S anexos:
 pane.item.attachments.count.singular=%S anexo:
 pane.item.attachments.count.plural=%S anexos:
 pane.item.attachments.select=Selecionar um arquivo
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=clique aqui
-pane.item.tags=Marcadores:
 pane.item.tags.count.zero=%S marcadores:
 pane.item.tags.count.singular=%S marcador:
 pane.item.tags.count.plural=%S marcadores:
 pane.item.tags.icon.user=Marcador do usuário
 pane.item.tags.icon.automatic=Marcador automático
-pane.item.related=Relacionados:
 pane.item.related.count.zero=%S relacionado:
 pane.item.related.count.singular=%S relacionado:
 pane.item.related.count.plural=%S relacionado:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Você não pode adicionar arquivos à cole
 ingester.saveToZotero=Salvar em Zotero
 ingester.saveToZoteroUsing=Salvar Zotero utilizando "%S"
 ingester.scraping=Salvando item...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Item salvo.
 ingester.scrapeError=Não foi possível salvar item.
 ingester.scrapeErrorDescription=Um erro ocorreu ao salvar este item. Verifique %S para mais informações.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=Sempre permitir para esse site
 
 ingester.importFile.title=Importar arquivo
 ingester.importFile.text=Você gostaria de importar o arquivo "%S"?\n\nItens serão adicionados a uma nova coleção.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Buscando...
 ingester.lookup.error=Um erro ocorreu durante a busca por esse documento.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Abrir PDFs e outros arquivos do %S quand
 zotero.preferences.openurl.resolversFound.zero=%S resolvedores encontrados
 zotero.preferences.openurl.resolversFound.singular=%S resolvedor encontrado
 zotero.preferences.openurl.resolversFound.plural=%S resolvedores encontrados
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Reconstruir índice
 zotero.preferences.search.rebuildWarning=Deseja reconstruir todo o índice? Isto pode levar algum tempo.\n\nPara indexar apenas os itens que ainda não foram indexados, use %S.
 zotero.preferences.search.clearIndex=Limpar índice
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Quaiquer tradutores nov
 zotero.preferences.advanced.resetStyles=Reconfigurar estilos
 zotero.preferences.advanced.resetStyles.changesLost=Quaiquer estilos novos ou modificados serão perdidos.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Os seguintes arquivos já existem no diretório de destino e não serão copiados:
 dragAndDrop.filesNotFound=Os seguintes arquivos não foram encontrados e não puderam ser copiados:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importar
 fileInterface.export=Exportar
 fileInterface.exportedItems=Itens exportados
 fileInterface.imported=Importado
-fileInterface.fileFormatUnsupported=Nenhum tradutor pode ser encontrado para o arquivo especificado.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Bibliografia sem título
 fileInterface.bibliographyHTMLTitle=Bibliografia
 fileInterface.importError=Um erro ocorreu ao tentar importar o arquivo selecionado. Por favor, certifique-se de que o arquivo é válido e tente novamente.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Os itens selecionados não contêm referências.
 fileInterface.bibliographyGenerationError=Um erro ocorreu ao gerar sua bibliografia. Por favor, tente novamente.
 fileInterface.exportError=Um erro ocorreu ao tentar exportar o arquivo selecionado.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Modo avançado de pequisa — pessione Enter para pesquisar.
 searchInProgress=Pesquisa em progresso — por favor, aguarde.
 
@@ -613,6 +677,7 @@ integration.cited.loading=Carregando referências citadas...
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Citação em branco
 integration.emptyCitationWarning.body=A citação que você especificou firaria em branco no estilo atualmente selecionado. Tem certeza de que deseja adicioná-la?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Esta versão do plugin Zotero para processador de textos ($INTEGRATION_VERSION) é incompatível com a versão atualmente instalada da extensão Firefox Zotero (%1$S). Por favor, certifique-se de instalar as versões mais recentes de ambos os componentes.
 integration.error.incompatibleVersion2=O Zotero %1$S requer %2$S %3$S ou superior. Por favor, faça o download da última versão de %2$S a partir de zotero.org.
@@ -643,14 +708,22 @@ integration.citationChanged=Você modificou essa citação desde que o Zotero a
 integration.citationChanged.description=Clicar em "Sim" impedirá que o Zoter atualize essa citação se você vier a adicionar citações suplementares, alterar estilos, ou mesmo modificar as referências a que ela se refere. Clicar em "Não" apagará as suas modificações.
 integration.citationChanged.edit=Você modificou essa citação desde que o Zotero a gerou. Sua edição irá apagar as modificações. Você quer continuar?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Instalar estilo "%1$S" de %2$S?
 styles.updateStyle=Atualizar o estilo existente "%1$S" com "%2$S" de %3$S?
 styles.installed=O estilo "%S" foi instalado com sucesso.
 styles.installError=%S não parece ser um arquivo de estilo válido.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S faz referância a um arquivo inválido ou inexistente em %2$S como sua fonte.
 styles.deleteStyle=Tem certeza de que deseja excluir o estilo "%1$S"?
 styles.deleteStyles=Tem certeza de que deseja excluir os estilos selecionados?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancelar sincronização
 sync.openSyncPreferences=Abrir preferências de sincronização...
 sync.resetGroupAndSync=Reconfigurar grupos e sincronização
@@ -660,8 +733,10 @@ sync.remoteObject=Objeto remoto
 sync.mergedObject=Objeto mesclado
 
 sync.error.usernameNotSet=Nome de usuário não configurado
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Senha não configurada
 sync.error.invalidLogin=Nome de usuário ou senha inválida
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Por favor, digite sua senha.
 sync.error.loginManagerCorrupted1=Zotero não pode acessar suas informações de login, provavelmente devido a um banco de dados de login do Firefox corrompido.
 sync.error.loginManagerCorrupted2=Feche o Firefox, faça uma cópia de segurança e exclua o arquivo singons.* de seu perfil Firefox; em seguida redigite suas informações de login no painel Sincronização das preferências Zotero.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Se você continuar, sua cópia do grupo será reconf
 sync.error.copyChangedItems=Se deseja uma oportunidade de copiar suas mudanças em outro lugar ou de requisitar direitos de escrita ao administrador do grupo, cancele a operação de sincronização agora.
 sync.error.manualInterventionRequired=Uma sincronização automática resultou em um conflito que requer intervenção manual.
 sync.error.clickSyncIcon=Clique o ícone de sincronização para sincronizar manualmente.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Ainda não sincronizado
 sync.status.lastSync=Última sincronização:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Enviando dados para o servidor de sincronização
 sync.status.uploadAccepted=Envio aceito - aguardando servidor de sincronização
 sync.status.syncingFiles=Sincronizando arquivos
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB restantes
 sync.storage.filesRemaining=%1$S/%2$S arquivos
 sync.storage.none=Nenhum
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Arquivo local
 sync.storage.remoteFile=Arquivo remoto
 sync.storage.savedFile=Arquivo salvo
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Configuração do servidor verificada
 sync.storage.fileSyncSetUp=A sincronização de arquivos foi configurada com sucesso.
 sync.storage.openAccountSettings=Configurações da Open Account ("conta aberta")
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=O servidor %S não pôde ser contatado.
 sync.storage.error.permissionDeniedAtAddress=Você não tem permissão para criar um diretório Zotero no seguinte endereço:
 sync.storage.error.checkFileSyncSettings=Por favor, verifique suas configurações de sincronização de arquivo ou contato o administrador de seu servidor.
 sync.storage.error.verificationFailed=Erro de verificação %S. Verifique suas configurações de sincronização no painel Sincronização das preferências Zotero.
 sync.storage.error.fileNotCreated=O arquivo '%S' não pode ser criado no diretório 'storage' do Zotero.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Você não tem mais direitos de edição para o grupo Zotero '%S'; os arquivos que você adicionou ou editou não podem ser sincronizados com o servidor.
 sync.storage.error.copyChangedItems=Se deseja uma oportunidade para copiar os itens e arquivos modificados para outro lugar, cancele a operação de sincronização agora.
 sync.storage.error.fileUploadFailed=Erro no envio de arquivo.
 sync.storage.error.directoryNotFound=Diretório não encontrado.
 sync.storage.error.doesNotExist=%S não existe.
 sync.storage.error.createNow=Deseja criá-lo agora?
-sync.storage.error.webdav.enterURL=Por favor, digite um endereço WebDAV válido.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S não é um endereço WebDAV válido.
 sync.storage.error.webdav.invalidLogin=O servidor WebDAV não aceitou o nome de usuário e a senha digitados.
 sync.storage.error.webdav.permissionDenied=Você não tem permissão para acessar %S no servidor WebDAV.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=Erro de conexão SSL ao conectar a
 sync.storage.error.webdav.loadURLForMoreInfo=Abra seu endereço WebDAV em seu navegador para mais informações.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Veja a documentação relativa à exceção de certificados para mais informações.
 sync.storage.error.webdav.loadURL=Abrir URL WebDAV
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Você excedeu sua cota do Armazenamento de Arquivos Zotero. Alguns arquivos não foram enviados. Outros dados Zotero continuarão a ser sincronizados com o servidor.
 sync.storage.error.zfs.personalQuotaReached2=Veja as configurações de sua conta zotero.org para opções adicionais de armazenamento.
 sync.storage.error.zfs.groupQuotaReached1=O grupo '%S' excedeu sua cota do Armazenamento de Arquivos Zotero. Alguns arquivos não foram enviados. Outros dados Zotero continuarão a ser sincronizados com o servidor.
 sync.storage.error.zfs.groupQuotaReached2=O dono do grupo pode aumentar a capacidade de armazenamento do grupo na seção de configurações de armazenamento em zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Salvar marcador
 sync.longTagFixer.saveTags=Salvar marcadores
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Não foi possível ler o texto do arquivo PDF.
 recognizePDF.noMatches=Nenhuma referência equivalente encontrada.
 recognizePDF.fileNotFound=Arquivo não encontrado.
 recognizePDF.limit=Limite de pesquisa alcançado. Tente novamente mais tarde.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Recuperação de metadados completa.
 recognizePDF.close.label=Fechar
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Selecione uma localização onde salvar o arquivo formatado
 rtfScan.scannedFileSuffix=(Analisado)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Erro de busca de verificação
 lookup.failure.description=Zotero não pôde encontrar um registro para o identificador especificado. Por favor, verifique o identificador e tente novamente.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Ver online
 locate.online.tooltip=Ir a este item online
diff --git a/chrome/locale/pt-PT/zotero/about.dtd b/chrome/locale/pt-PT/zotero/about.dtd
index 48fe7b43ad..e9406e3c5b 100644
--- a/chrome/locale/pt-PT/zotero/about.dtd
+++ b/chrome/locale/pt-PT/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Agradecimentos Especiais:">
 <!ENTITY zotero.about.close "Fechar">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Mais Créditos e Reconhecimentos">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/pt-PT/zotero/preferences.dtd b/chrome/locale/pt-PT/zotero/preferences.dtd
index 655dbd62a4..f76e6aed58 100644
--- a/chrome/locale/pt-PT/zotero/preferences.dtd
+++ b/chrome/locale/pt-PT/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Por omissão:">
 <!ENTITY zotero.preferences.items "itens">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Gerais">
 
@@ -38,7 +39,7 @@
 <!ENTITY zotero.preferences.groups.childNotes "nós descendentes">
 <!ENTITY zotero.preferences.groups.childFiles "retratos descendentes e arquivos importados">
 <!ENTITY zotero.preferences.groups.childLinks "ligações descendentes">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "etiquetas">
 
 <!ENTITY zotero.preferences.openurl.caption "OpenURL">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Sincronizar arquivos anexos da Minha Biblioteca usando">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Sincronizar arquivos anexos de bibliotecas de grupos usando a armazenagem Zotero">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Ao usar a armazenagem Zotero concorda ter de se reger pelos seus">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "termos e condições">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Sincronização Completa com o Servidor Zotero">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Integre os dados Zotero locais com os do servidor de sincronização ignorando o histórico de sincronização.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Recuperar a partir do Servidor Zotero">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Remover todos os dados no servidor e sobrepor-lhes os dados Zotero locais.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Reiniciar o Histórico de Sincronização de Arquivos">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Forçar a verificação do servidor de armazenamento para todos os arquivos anexos.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reiniciar...">
 
 
@@ -114,13 +121,14 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Título">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Actualizado">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Obter estilos adicionais...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Teclas de Atalho">
 
 <!ENTITY zotero.preferences.keys.openZotero "Abrir/Fechar Painel do Zotero">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Alternar Modo de Ecrã Inteiro">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "Foco no Painel de Bibliotecas">
 <!ENTITY zotero.preferences.keys.quicksearch "Procura Rápida">
 <!ENTITY zotero.preferences.keys.newItem "Criar um novo item">
 <!ENTITY zotero.preferences.keys.newNote "Criar uma nova nota">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Qualquer texto">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avançadas">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Localizar">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Gestor do Motor de Localização de Artigos">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Escolher...">
 <!ENTITY zotero.preferences.dataDir.reveal "Mostrar Pasta de Dados">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Manutenção da Base de Dados">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Verificar Integridade da Base de Dados">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reiniciar Tradutores e Estilos...">
diff --git a/chrome/locale/pt-PT/zotero/standalone.dtd b/chrome/locale/pt-PT/zotero/standalone.dtd
index 4bb4e084dd..064204ee0d 100644
--- a/chrome/locale/pt-PT/zotero/standalone.dtd
+++ b/chrome/locale/pt-PT/zotero/standalone.dtd
@@ -12,12 +12,12 @@
 
 <!ENTITY fileMenu.label "Ficheiro">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "Guardar...">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
+<!ENTITY pageSetupCmd.label "Configuração das Páginas...">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "Imprimir...">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "U">
 <!ENTITY closeCmd.label "Fechar">
diff --git a/chrome/locale/pt-PT/zotero/timeline.properties b/chrome/locale/pt-PT/zotero/timeline.properties
index 91043c16e0..c84fcacba6 100644
--- a/chrome/locale/pt-PT/zotero/timeline.properties
+++ b/chrome/locale/pt-PT/zotero/timeline.properties
@@ -1,6 +1,6 @@
 general.title=Linha do Tempo do Zotero
 general.filter=Filtro:
-general.highlight=Enfatizar:
+general.highlight=Destacar:
 general.clearAll=Limpar Tudo
 general.jumpToYear=Saltar para Ano:
 general.firstBand=Primeira Faixa:
diff --git a/chrome/locale/pt-PT/zotero/zotero.dtd b/chrome/locale/pt-PT/zotero/zotero.dtd
index 3d0891bd98..998b0bbcc3 100644
--- a/chrome/locale/pt-PT/zotero/zotero.dtd
+++ b/chrome/locale/pt-PT/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Editar">
 <!ENTITY zotero.general.delete "Remover">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "O registo de erros pode incluir mensagens alheias ao Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Por favor aguarde enquanto o relatório de erro é enviado.">
 <!ENTITY zotero.errorReport.submitted "O relatório de erro foi enviado.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Por favor crie uma mensagem nos fóruns do Zotero (em forums.zotero.org) incluindo este ID de Relatório, uma descrição do problema e os passos necessários para o reproduzir.">
 <!ENTITY zotero.errorReport.notReviewed "Relatórios de erro não são geralmente revistos excepto quando mencionados nos fóruns.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Instalou uma nova versão do Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "A sua base de dados do Zotero precisa de ser actualizada para poder funcionar com a nova versão.">
 <!ENTITY zotero.upgrade.autoBackup "A base de dados existente será salvaguardada automaticamente antes de se fazer qualquer alteração.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Direitos">
 <!ENTITY zotero.items.dateAdded_column "Data de Adição">
 <!ENTITY zotero.items.dateModified_column "Data de Modificação">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Mostrar na Biblioteca">
 <!ENTITY zotero.items.menu.attach.note "Adicionar Nota">
@@ -68,10 +86,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restaurar para a Biblioteca">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicar o Item Seleccionado">
-<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+<!ENTITY zotero.items.menu.mergeItems "Fundir itens...">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
-<!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "Escolha a versão do item a usar como item principal:">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "Seleccione os campos a manter de outras versões do item:">
 
 <!ENTITY zotero.toolbar.newItem.label "Novo Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Mais">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Transformar Texto">
 <!ENTITY zotero.item.textTransform.titlecase "Maiúsculas Iniciais de Título">
 <!ENTITY zotero.item.textTransform.sentencecase "Caixa da frase">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nova Nota">
 <!ENTITY zotero.toolbar.note.standalone "Nova Nota Isolada">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Marcar Visíveis">
 <!ENTITY zotero.tagSelector.clearVisible "Desmarcar Visíveis">
 <!ENTITY zotero.tagSelector.clearAll "Desmarcar Todos">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Alterar a Etiqueta...">
 <!ENTITY zotero.tagSelector.deleteTag "Remover a Etiqueta...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Introduzir na caixa abaixo o ISBN, o DOI, ou o PMID a procurar.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Seleccionar Itens">
 <!ENTITY zotero.selectitems.intro.label "Seleccione os itens que deseja adicionar à sua biblioteca">
@@ -132,9 +159,9 @@
 
 <!ENTITY zotero.bibliography.title "Criar Bibliografia">
 <!ENTITY zotero.bibliography.style.label "Estilo de Citação:">
-<!ENTITY zotero.bibliography.outputMode "Output Mode:">
-<!ENTITY zotero.bibliography.bibliography "Bibliography">
-<!ENTITY zotero.bibliography.outputMethod "Output Method:">
+<!ENTITY zotero.bibliography.outputMode "Modo de Saída:">
+<!ENTITY zotero.bibliography.bibliography "Bibliografia:">
+<!ENTITY zotero.bibliography.outputMethod "Método de Saída:">
 <!ENTITY zotero.bibliography.saveAsRTF.label "Guardar como RTF">
 <!ENTITY zotero.bibliography.saveAsHTML.label "Guardar como HTML">
 <!ENTITY zotero.bibliography.copyToClipboard.label "Copiar">
@@ -143,7 +170,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Preferências do Documento">
 <!ENTITY zotero.integration.addEditCitation.title "Adicionar/Editar Citação">
 <!ENTITY zotero.integration.editBibliography.title "Editar Bibliografia">
-<!ENTITY zotero.integration.quickFormatDialog.title "Quick Format Citation">
+<!ENTITY zotero.integration.quickFormatDialog.title "Formatação Rápida da Citação">
 
 <!ENTITY zotero.progress.title "Progresso">
 
@@ -162,7 +189,7 @@
 <!ENTITY zotero.citation.suppressAuthor.label "Suprimir Autor">
 <!ENTITY zotero.citation.prefix.label "Prefixo:">
 <!ENTITY zotero.citation.suffix.label "Sufixo:">
-<!ENTITY zotero.citation.editorWarning.label "Warning: If you edit a citation in the editor it will no longer update to reflect changes in your database or the citation style.">
+<!ENTITY zotero.citation.editorWarning.label "Aviso: Se editar uma citação no editor, não voltará a ser actualizada para reflectir alterações na sua base de dados ou no estilo de citação.">
 
 <!ENTITY zotero.richText.italic.label "Itálico">
 <!ENTITY zotero.richText.bold.label "Negrito">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "As etiquetas por marcar não serão guardadas.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "A etiqueta será removida de todos os itens.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Cópia Local Reconhecida">
 <!ENTITY zotero.proxy.recognized.warning "Adicione apenas cópias locais com ligações a partir da sua biblioteca, escola ou sítio Web corporativo">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Adicionar outras cópias locais permite que sítios maliciosos se façam passar pelos sítios Web em que confia.">
diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties
index 808a115bbf..2f50b788d5 100644
--- a/chrome/locale/pt-PT/zotero/zotero.properties
+++ b/chrome/locale/pt-PT/zotero/zotero.properties
@@ -11,9 +11,12 @@ general.restartRequiredForChange=O %S tem de ser reiniciado para que a alteraç
 general.restartRequiredForChanges=O %S tem de ser reiniciado para que as alterações tenham efeito.
 general.restartNow=Reiniciar agora
 general.restartLater=Reiniciar mais tarde
-general.restartApp=Restart %S
+general.restartApp=Reiniciar %S
 general.errorHasOccurred=Ocorreu um erro.
 general.unknownErrorOccurred=Ocorreu um erro desconhecido.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Por favor reinicie o Firefox.
 general.restartFirefoxAndTryAgain=Por favor reinicie o Firefox e tente de novo.
 general.checkForUpdate=Verificar existência de actualizações
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Ver %S para mais informações.
 general.enable=Activar
 general.disable=Desactivar
 general.remove=Remover
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Abrir Documentação
-general.numMore=%S more…
+general.numMore=Mais %S...
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Está em curso uma operação do Zotero.
 general.operationInProgress.waitUntilFinished=Por favor espere que termine.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Carregue em %S para reportar um erro aos programadore
 errorReport.stepsToReproduce=Passos para Reproduzir:
 errorReport.expectedResult=Resultado esperado:
 errorReport.actualResult=Resultado obtido:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=A pasta de dados do Zotero não foi encontrada.
 dataDir.previousDir=Pasta anterior:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Usar a pasta de perfis do Firefox
 dataDir.selectDir=Escolha uma pasta de dados para o Zotero
 dataDir.selectedDirNonEmpty.title=Pasta Não Vazia
 dataDir.selectedDirNonEmpty.text=A pasta que escolheu não está vazia e não parece ser uma pasta de dados do Zotero.\n\nCriar arquivos do Zotero nesta pasta de qualquer forma?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Notificação de Migração Zotero
 dataDir.standaloneMigration.description=Para ser a primeira vez que usa o %1$S. Quer que o %1$S importe as suas preferências do %2$S e use o directório de dados já existente?
 dataDir.standaloneMigration.multipleProfiles=%1$S partilhará o seu directório de dados com o perfil usado à mais recentemente.
@@ -114,10 +141,11 @@ pane.collections.newSavedSeach=Nova Procura Guardada
 pane.collections.savedSearchName=Introduza um nome para esta procura guardada:
 pane.collections.rename=Alterar o nome da colecção:
 pane.collections.library=A minha Biblioteca
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Lixo
 pane.collections.untitled=Sem título
 pane.collections.unfiled=Se estiver aberto o Firefox com a extensão Zotero, por favor feche-o e reinicie o Zotero Autónomo.
-pane.collections.duplicate=Duplicate Items
+pane.collections.duplicate=Itens duplicados
 
 pane.collections.menu.rename.collection=Alterar Nome da Colecção...
 pane.collections.menu.edit.savedSearch=Editar Procura Guardada
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Quer mesmo remover esta etiqueta?\n\nA etiqueta
 pane.tagSelector.numSelected.none=0 etiquetas seleccionadas
 pane.tagSelector.numSelected.singular=%S etiqueta seleccionada
 pane.tagSelector.numSelected.plural=%S etiquetas seleccionadas
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Carregando lista de itens...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Mover para o Lixo
 pane.items.trash=Quer mesmo mover o item seleccionado para o Lixo?
 pane.items.trash.multiple=Quer mesmo mover os itens seleccionados para o Lixo?
@@ -176,10 +210,15 @@ pane.items.interview.manyParticipants=Entrevista por %S et al.
 
 pane.item.selected.zero=Nenhum item seleccionado
 pane.item.selected.multiple=%S itens seleccionados
-pane.item.unselected.zero=No items in this view
-pane.item.unselected.singular=%S item in this view
-pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+pane.item.unselected.zero=Nenhum item nesta vista
+pane.item.unselected.singular=%S item nesta vista
+pane.item.unselected.plural=%S itens nesta vista
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Alterar Tipo de Item
 pane.item.changeType.text=Quer mesmo alterar o tipo de item?\n\nPerder-se-á os seguintes campos:
@@ -188,8 +227,8 @@ pane.item.defaultLastName=último
 pane.item.defaultFullName=nome completo
 pane.item.switchFieldMode.one=Trocar para um só campo
 pane.item.switchFieldMode.two=Trocar para dois campos
-pane.item.creator.moveUp=Move Up
-pane.item.creator.moveDown=Move Down
+pane.item.creator.moveUp=Mover Para Cima
+pane.item.creator.moveDown=Mover Para Baixo
 pane.item.notes.untitled=Nota Sem Título
 pane.item.notes.delete.confirm=Quer mesmo remover esta nota?
 pane.item.notes.count.zero=%S notas:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S anexos:
 pane.item.attachments.count.singular=%S anexo:
 pane.item.attachments.count.plural=%S anexos:
 pane.item.attachments.select=Seleccione um Arquivo
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=carregue aqui
-pane.item.tags=Etiquetas:
 pane.item.tags.count.zero=%S etiquetas:
 pane.item.tags.count.singular=%S etiqueta:
 pane.item.tags.count.plural=%S etiquetas:
 pane.item.tags.icon.user=Etiqueta adicionada pelo utilizador
 pane.item.tags.icon.automatic=Etiqueta adicionada automaticamente
-pane.item.related=Relações:
 pane.item.related.count.zero=%S relações:
 pane.item.related.count.singular=%S relação:
 pane.item.related.count.plural=%S relações:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Não pode adicionar ficheiros à colecçã
 ingester.saveToZotero=Guardar no Zotero
 ingester.saveToZoteroUsing=Guarda no Zotero usando "%S"
 ingester.scraping=Guardando Item...
+ingester.scrapingTo=Saving to
 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.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=Permitir sempre para este sítio Web
 
 ingester.importFile.title=Importar Ficheiro
 ingester.importFile.text=Quer importar o ficheiro "%S"?\n\nOs itens serão adicionados a uma nova colecção.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Localizando...
 ingester.lookup.error=Ocorreu um erro ao localizar este item.
@@ -441,20 +483,33 @@ db.dbRestoreFailed=A base de dados Zotero '%S' parece ter ficado corrompida e fa
 db.integrityCheck.passed=Não foram encontrados erros na base de dados.
 db.integrityCheck.failed=Encontraram-se erros na base de dados do Zotero!
 db.integrityCheck.dbRepairTool=Pode usar a ferramenta de reparação de bases de dados disponível em http://zotero.org/utils/dbfix para tentar corrigir estes erros.
-db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
-db.integrityCheck.appRestartNeeded=%S will need to be restarted.
-db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
-db.integrityCheck.errorsFixed=The errors in your Zotero database have been corrected.
-db.integrityCheck.errorsNotFixed=Zotero was unable to correct all the errors in your database.
-db.integrityCheck.reportInForums=You can report this problem in the Zotero Forums.
+db.integrityCheck.repairAttempt=O Zotero pode tentar corrigir estes erros.
+db.integrityCheck.appRestartNeeded=O %S terá de ser reiniciado.
+db.integrityCheck.fixAndRestart=Corrigir Erros e Reiniciar %S
+db.integrityCheck.errorsFixed=Os erros na base de dados do Zotero foram corrigidos.
+db.integrityCheck.errorsNotFixed=O Zotero não conseguiu corrigir todos os erros na base de dados.
+db.integrityCheck.reportInForums=Pode reportar este problema nos fóruns do Zotero.
 
 zotero.preferences.update.updated=Foi actualizado
 zotero.preferences.update.upToDate=Está actualizado
 zotero.preferences.update.error=Erro
-zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when possible
+zotero.preferences.launchNonNativeFiles=Abrir PDF e outros ficheiros dentro de %S quando possível
 zotero.preferences.openurl.resolversFound.zero=%S resolvedores encontrados
 zotero.preferences.openurl.resolversFound.singular=%S resolvedor encontrado
 zotero.preferences.openurl.resolversFound.plural=%S resolvedores encontrados
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Reconstruir Índice
 zotero.preferences.search.rebuildWarning=Quer reconstruir todo o índice? Pode ser demorado.\n\Para indexar apenas itens que não tenham ainda sido indexados, use %S.
 zotero.preferences.search.clearIndex=Limpar Índice
@@ -481,7 +536,7 @@ zotero.preferences.search.pdf.tryAgainOrViewManualInstructions=Por favor tente m
 zotero.preferences.export.quickCopy.bibStyles=Estilos Bibliográficos.
 zotero.preferences.export.quickCopy.exportFormats=Formatos de Exportação
 zotero.preferences.export.quickCopy.instructions=A Cópia Rápida permite-lhe copiar referências seleccionadas usando uma tecla de atalho (%S) ou arrastar os itens para uma caixa de texto de uma página Web.
-zotero.preferences.export.quickCopy.citationInstructions=For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
+zotero.preferences.export.quickCopy.citationInstructions=No que respeita a estilos bibliográficos, pode copiar citações ou notas de rodapé pressionando %S ou carregando em Shift antes de arrastar os itens.
 zotero.preferences.styles.addStyle=Adicionar Estilo
 
 zotero.preferences.advanced.resetTranslatorsAndStyles=Reiniciar Tradutores e Estilos
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Perder-se-á todos os t
 zotero.preferences.advanced.resetStyles=Reiniciar Estilos
 zotero.preferences.advanced.resetStyles.changesLost=Perder-se-á todos os estilos novos ou modificados.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Os seguintes arquivos existiam já na pasta de destino e, por isso, não foram copiados:
 dragAndDrop.filesNotFound=Os seguintes arquivos não foram encontrados e, por isso, não foram copiados:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importar
 fileInterface.export=Exportar
 fileInterface.exportedItems=Itens Exportados
 fileInterface.imported=Importados
-fileInterface.fileFormatUnsupported=Não se encontrou nenhum tradutor para o arquivo dado.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Bibliografia sem Título
 fileInterface.bibliographyHTMLTitle=Bibliografia
 fileInterface.importError=Ocorreu um erro ao tentar importar o arquivo seleccionado. Por favor assegure-se de que o arquivo é válido e tente de novo.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Os itens que seleccionou não contêm referênci
 fileInterface.bibliographyGenerationError=Ocorreu um erro ao gerar a sua bibliografia. Por favor tente de novo.
 fileInterface.exportError=Ocorreu um erro ao tentar exportar o arquivo seleccionado.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Modo de procura avançada — carregue em Enter para procurar.
 searchInProgress=Procura em progresso — por favor aguarde.
 
@@ -556,7 +620,7 @@ fulltext.indexState.partial=Parcial
 
 exportOptions.exportNotes=Exportar Notas
 exportOptions.exportFileData=Exportar Arquivos
-exportOptions.useJournalAbbreviation=Use Journal Abbreviation
+exportOptions.useJournalAbbreviation=Usar Abreviatura de Publicação
 charset.UTF8withoutBOM=Unicode (UTF-8 sem BOM)
 charset.autoDetect=(auto-detecção)
 
@@ -572,8 +636,8 @@ citation.multipleSources=Fontes Múltiplas...
 citation.singleSource=Fonte Única...
 citation.showEditor=Mostrar Editor...
 citation.hideEditor=Esconder Editor...
-citation.citations=Citations
-citation.notes=Notes
+citation.citations=Citações
+citation.notes=Notas
 
 report.title.default=Relatório Zotero
 report.parentItem=Item Pai:
@@ -613,6 +677,7 @@ integration.cited.loading=Carregando Itens Citados...
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Citação em Branco
 integration.emptyCitationWarning.body=A citação que especificou ficaria vazia no estilo actualmente seleccionado. Tem a certeza de que a quer adicionar?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Esta versão do extra para o processador de texto ($INTEGRATION_VERSION) é incompatível com a versão da extensão Zotero para o Firefox instalada actualmente (%1$S). Por favor assegure-se de que está a usar as últimas versões de ambos os componentes.
 integration.error.incompatibleVersion2=O Zotero %1$S requer o %2$S %3$S ou uma versão mais recente. Por favor descarregue uma versão mais recente do %2$S a partir de zotero.org.
@@ -643,14 +708,22 @@ integration.citationChanged=Alterou esta citação depois da sua geração pelo
 integration.citationChanged.description=Carregar em "Sim" impedirá o Zotero de actualizar esta citação no caso de adicionar novas citações, de trocar de estilos ou de modificar a referência citada. Carregar em "No" apagará as suas alterações.
 integration.citationChanged.edit=Alterou esta citação desde a sua geração pelo Zotero. Editá-la cancelará as suas alterações. Quer mesmo continuar?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Instalar o estilo "%1$S" de %2$S?
 styles.updateStyle=Actualizar o estilo "%1$S" existente com "%2$S" de %3$S?
 styles.installed=O estilo "%S" foi instalado com sucesso.
 styles.installError=%S não aparenta ser um arquivo de estilo válido.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S referencia um arquivo CSL inválido ou inexistente em %2$S como sua fonte.
 styles.deleteStyle=Quer mesmo remover o estilo "%1$S"?
 styles.deleteStyles=Quer mesmo remover os estilos seleccionados?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancelar Sincronização
 sync.openSyncPreferences=Abrir Preferências de Sincronização...
 sync.resetGroupAndSync=Reiniciar Grupo e Sincronização
@@ -660,8 +733,10 @@ sync.remoteObject=Objecto Remoto
 sync.mergedObject=Objecto Integrado
 
 sync.error.usernameNotSet=Nome de utilizador por indicar
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Palavra-passe por indicar
 sync.error.invalidLogin=Nome de utilizador inválido ou palavra-passe inválida.
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Por favor introduza uma palavra-passe.
 sync.error.loginManagerCorrupted1=O Zotero não consegue aceder às suas credenciais, provavelmente devido ao corrompimento de uma base de dados do gestor de credenciais do Firefox.
 sync.error.loginManagerCorrupted2=Feche o Firefox, faça cópias de segurança e remova os signons.* do seu perfil do Firefox. Depois reintroduza as suas credenciais do Zotero no painel de sincronização das preferências do Zotero.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Se continuar, a sua cópia do grupo será reiniciada
 sync.error.copyChangedItems=Se quiser ter uma oportunidade para copiar as suas alterações para lugar seguro ou para pedir acesso de escrita ao administrador do grupo, cancela a sincronização imediatamente.
 sync.error.manualInterventionRequired=Uma sincronização automática resultou num conflito que requer uma intervenção manual.
 sync.error.clickSyncIcon=Carregue no ícone de sincronização para sincronizar manualmente.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Por sincronizar
 sync.status.lastSync=Última sincronização:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Carregando dados no servidor de sincronização
 sync.status.uploadAccepted=Carregamento aceite - esperando pelo servidor de sincronização
 sync.status.syncingFiles=Sincronizando arquivos
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%S Kio em falta
 sync.storage.filesRemaining=%1$S/%2$S arquivos
 sync.storage.none=Nenhum
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Arquivo Local
 sync.storage.remoteFile=Arquivo Remoto
 sync.storage.savedFile=Arquivo Guardado
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Configuração do servidor verificada
 sync.storage.fileSyncSetUp=A sincronização de arquivos foi preparada com sucesso.
 sync.storage.openAccountSettings=Abrir Opções de Conta
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Não foi possível alcançar o servidor %S.
 sync.storage.error.permissionDeniedAtAddress=Não tem permissão para criar uma pasta Zotero no seguinte endereço:
 sync.storage.error.checkFileSyncSettings=Por favor verifique as opções de sincronização de arquivos ou contacte o administrador do seu servidor.
 sync.storage.error.verificationFailed=Falhou a verificação de %S. Verifique as opções de sincronização de arquivos no painel de sincronização das preferências do Zotero.
 sync.storage.error.fileNotCreated=Não foi possível criar o ficheiro '%S' no directório 'storage' do Zotero.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Já não tem acesso à edição de arquivos no grupo Zotero '%S'. Assim, arquivos que adicionou ou editou não podem ser sincronizados com o servidor.
 sync.storage.error.copyChangedItems=Se quiser uma oportunidade para copiar itens ou arquivos alterados para lugar seguro, cancele a sincronização imediatamente.
 sync.storage.error.fileUploadFailed=Carregamento de arquivo falhou.
 sync.storage.error.directoryNotFound=Pasta não encontrada
 sync.storage.error.doesNotExist=%S não existe.
 sync.storage.error.createNow=Quer criá-la agora?
-sync.storage.error.webdav.enterURL=Por favor introduza um URL de WebDAV.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S não é um URL de WebDAV válido.
 sync.storage.error.webdav.invalidLogin=O servidor WebDAV não aceitou as credenciais que introduziu.
 sync.storage.error.webdav.permissionDenied=Não tem permissão para aceder a %S no servidor WebDAV.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=Erro de ligação SSL ao ligar a %S
 sync.storage.error.webdav.loadURLForMoreInfo=Carregue o seu URL de WebDAV no navegador para obter mais informação.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Ver a documentação acerca da sobrecarga de certificados para mais informação.
 sync.storage.error.webdav.loadURL=Carregar URL WebDAV
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Atingiu o limite da sua quota de Armazenamento de Arquivos Zotero. Alguns arquivos não foram carregados. Outros dados do Zotero continuarão a ser sincronizados com o servidor.
 sync.storage.error.zfs.personalQuotaReached2=Veja as opções da sua conta zotero.org para mais possibilidades de armazenamento.
 sync.storage.error.zfs.groupQuotaReached1=O grupo '%S' atingiu o limite da sua quota de Armazenamento de Arquivos Zotero. Alguns arquivos não foram carregados. Outros dados do Zotero continuarão a ser sincronizados com o servidor.
 sync.storage.error.zfs.groupQuotaReached2=O proprietário do grupo pode aumentar a capacidade de armazenagem do grupo a partir das opções de armazenamento em zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Guardar Etiqueta
 sync.longTagFixer.saveTags=Guardar Etiquetas
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Não foi possível ler texto do PDF.
 recognizePDF.noMatches=Não se encontrou referências correspondentes.
 recognizePDF.fileNotFound=O ficheiro não foi encontrado.
 recognizePDF.limit=Número limite de pedidos atingindo. Tente mais tarde.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Obtenção de Metadados Completa.
 recognizePDF.close.label=Fechar
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Formato de Texto Rico (.rtf)
 rtfScan.saveTitle=Seleccionar uma localização na qual guardar o arquivo formatado
 rtfScan.scannedFileSuffix=(Analisado)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Procura Falhada
 lookup.failure.description=O Zotero não conseguiu encontrar um registo para o identificador especificado. Por favor verifique o identificador e tente de novo.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Ver em linha
 locate.online.tooltip=Ir para este item em linha
diff --git a/chrome/locale/ro-RO/zotero/about.dtd b/chrome/locale/ro-RO/zotero/about.dtd
index 8d34e8d4bb..81cf145de3 100644
--- a/chrome/locale/ro-RO/zotero/about.dtd
+++ b/chrome/locale/ro-RO/zotero/about.dtd
@@ -9,4 +9,5 @@
 <!ENTITY zotero.executiveProducer "Producător executiv:">
 <!ENTITY zotero.thanks "Mulțumiri speciale:">
 <!ENTITY zotero.about.close "Închide">
-<!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.moreCreditsAndAcknowledgements "Participanți și mulțumiri suplimentare">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/ro-RO/zotero/preferences.dtd b/chrome/locale/ro-RO/zotero/preferences.dtd
index 1c1b1c2aef..1712fcf2ed 100644
--- a/chrome/locale/ro-RO/zotero/preferences.dtd
+++ b/chrome/locale/ro-RO/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Implicite:">
 <!ENTITY zotero.preferences.items "înregistrări">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Generale">
 
@@ -10,14 +11,14 @@
 <!ENTITY zotero.preferences.showIn "Încarcă Zotero în:">
 <!ENTITY zotero.preferences.showIn.browserPane "Panou browser">
 <!ENTITY zotero.preferences.showIn.separateTab "Filă separată">
-<!ENTITY zotero.preferences.showIn.appTab "App tab">
+<!ENTITY zotero.preferences.showIn.appTab "Filă aplicație">
 <!ENTITY zotero.preferences.statusBarIcon "Imaginea din bara de stare:">
 <!ENTITY zotero.preferences.statusBarIcon.none "Niciuna">
 <!ENTITY zotero.preferences.fontSize "Mărime caractere:">
 <!ENTITY zotero.preferences.fontSize.small "Mici">
 <!ENTITY zotero.preferences.fontSize.medium "Medii">
 <!ENTITY zotero.preferences.fontSize.large "Mari">
-<!ENTITY zotero.preferences.fontSize.xlarge "X-Large">
+<!ENTITY zotero.preferences.fontSize.xlarge "X-Mare">
 <!ENTITY zotero.preferences.fontSize.notes "Mărimea fontului pentru notă:">
 
 <!ENTITY zotero.preferences.miscellaneous "Diverse">
@@ -38,7 +39,7 @@
 <!ENTITY zotero.preferences.groups.childNotes "note copil">
 <!ENTITY zotero.preferences.groups.childFiles "instantanee copil și fișiere importate">
 <!ENTITY zotero.preferences.groups.childLinks "legături copil">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "etichete">
 
 <!ENTITY zotero.preferences.openurl.caption "Deschide URL">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Sincronizare fișiere anexate în Biblioteca mea folosind">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Sincronizare fișiere anexate într-un grup de biblioteci folosind depozitul Zotero">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Dacă folosești depozitul Zotero, ești de acord să fii conectat la">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "termeni și condiții">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Sincronizare completă cu serverul Zotero">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Unește datele locale din Zotero cu datele de pe serverul de sincronizare, ignorând istoria sincronizărilor.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Restaurare de pe serverul Zotero">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Șterge toate datele de pe server și suprascrie cu datele locale din Zotero.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Resetează istoria sincronizării fișierelor">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Forțează controlul serverului de stocare pentru toate fișierele locale anexate.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Resetare...">
 
 
@@ -108,19 +115,20 @@
 <!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "Niciu plug-in pentru procesorul de text nu este instalat în acest moment.">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "Obține plug-in-urile pentru procesorul de text...">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation_for_zotero_2.1">
-<!ENTITY zotero.preferences.cite.wordProcessors.useClassicAddCitationDialog "Use classic Add Citation dialog">
+<!ENTITY zotero.preferences.cite.wordProcessors.useClassicAddCitationDialog "Folosește caseta clasică de dialog Adaugă citare">
 
 <!ENTITY zotero.preferences.cite.styles.styleManager "Manager de stiluri">
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titlu">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Actualizat">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Obține stiluri suplimentare...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Scurtături de la tastatură">
 
 <!ENTITY zotero.preferences.keys.openZotero "Deschide/Închide panoul Zotero">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Extinde pe tot ecranul">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focalizare Panou de biblioteci">
 <!ENTITY zotero.preferences.keys.quicksearch "Căutare rapidă">
 <!ENTITY zotero.preferences.keys.newItem "Creează o înregistrare nouă">
 <!ENTITY zotero.preferences.keys.newNote "Creează o notă nouă">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Orice șir">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avansate">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Localizează">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Manager pentru motorul de căutare a articolelor">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Alege...">
 <!ENTITY zotero.preferences.dataDir.reveal "Afișează directorul de date">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Întreținerea bazei de date">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Controlează integritatea bazei de date">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Resetează traducători și stiluri...">
@@ -187,6 +202,6 @@
 <!ENTITY zotero.preferences.debugOutputLogging.clearOutput "Ștergere ieșire">
 <!ENTITY zotero.preferences.debugOutputLogging.submitToServer "Trimitere către serverul Zotero">
 
-<!ENTITY zotero.preferences.openAboutConfig "Open about:config">
-<!ENTITY zotero.preferences.openCSLEdit "Open CSL Editor">
-<!ENTITY zotero.preferences.openCSLPreview "Open CSL Preview">
+<!ENTITY zotero.preferences.openAboutConfig "Deschide about:config">
+<!ENTITY zotero.preferences.openCSLEdit "Deschide editorul CSL">
+<!ENTITY zotero.preferences.openCSLPreview "Deschide Previzualizare CSL">
diff --git a/chrome/locale/ro-RO/zotero/standalone.dtd b/chrome/locale/ro-RO/zotero/standalone.dtd
index 59353167d6..66eaa9aa79 100644
--- a/chrome/locale/ro-RO/zotero/standalone.dtd
+++ b/chrome/locale/ro-RO/zotero/standalone.dtd
@@ -1,23 +1,23 @@
-<!ENTITY preferencesCmdMac.label "Preferences…">
+<!ENTITY preferencesCmdMac.label "Preferințe...">
 <!ENTITY preferencesCmdMac.commandkey ",">
-<!ENTITY servicesMenuMac.label "Services">
-<!ENTITY hideThisAppCmdMac.label "Hide &brandShortName;">
+<!ENTITY servicesMenuMac.label "Servicii">
+<!ENTITY hideThisAppCmdMac.label "Ascunde &brandShortName;">
 <!ENTITY hideThisAppCmdMac.commandkey "H">
-<!ENTITY hideOtherAppsCmdMac.label "Hide Others">
+<!ENTITY hideOtherAppsCmdMac.label "Ascunde celelalte">
 <!ENTITY hideOtherAppsCmdMac.commandkey "H">
-<!ENTITY showAllAppsCmdMac.label "Show All">
+<!ENTITY showAllAppsCmdMac.label "Afișează tot">
 <!ENTITY quitApplicationCmdMac.label "Părăsește Zotero">
 <!ENTITY quitApplicationCmdMac.key "Q">
 
 
 <!ENTITY fileMenu.label "Fișier">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "Salvează...">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
+<!ENTITY pageSetupCmd.label "Setări pagină...">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "Imprimă...">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "U">
 <!ENTITY closeCmd.label "Închide">
@@ -43,8 +43,8 @@
 <!ENTITY copyCmd.label "Copiere">
 <!ENTITY copyCmd.key "C">
 <!ENTITY copyCmd.accesskey "C">
-<!ENTITY copyCitationCmd.label "Copy Citation">
-<!ENTITY copyBibliographyCmd.label "Copy Bibliography">
+<!ENTITY copyCitationCmd.label "Copiază citare">
+<!ENTITY copyBibliographyCmd.label "Copiază bibliografie">
 <!ENTITY pasteCmd.label "Lipire">
 <!ENTITY pasteCmd.key "V">
 <!ENTITY pasteCmd.accesskey "P">
@@ -58,7 +58,7 @@
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label "Preferințe">
 <!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Find">
+<!ENTITY findCmd.label "Găsește">
 <!ENTITY findCmd.accesskey "F">
 <!ENTITY findCmd.commandkey "f">
 <!ENTITY bidiSwitchPageDirectionItem.label "Schimbă direcția paginii">
@@ -68,34 +68,34 @@
 <!ENTITY bidiSwitchTextDirectionItem.commandkey "X">
 
 
-<!ENTITY toolsMenu.label "Tools">
+<!ENTITY toolsMenu.label "Instrumente">
 <!ENTITY toolsMenu.accesskey "T">
-<!ENTITY addons.label "Add-ons">
+<!ENTITY addons.label "Extensii">
 
 
 <!ENTITY minimizeWindow.key "m">
-<!ENTITY minimizeWindow.label "Minimize">
-<!ENTITY bringAllToFront.label "Bring All to Front">
-<!ENTITY zoomWindow.label "Zoom">
-<!ENTITY windowMenu.label "Window">
+<!ENTITY minimizeWindow.label "Minimizare">
+<!ENTITY bringAllToFront.label "Adu totul în față">
+<!ENTITY zoomWindow.label "Mărire/Micșorare">
+<!ENTITY windowMenu.label "Fereastră">
 
 
-<!ENTITY helpMenu.label "Help">
+<!ENTITY helpMenu.label "Ajutor">
 <!ENTITY helpMenu.accesskey "H">
 
 
-<!ENTITY helpMenuWin.label "Help">
+<!ENTITY helpMenuWin.label "Ajutor">
 <!ENTITY helpMenuWin.accesskey "H">
 <!ENTITY helpMac.commandkey "?">
-<!ENTITY aboutProduct.label "About &brandShortName;">
+<!ENTITY aboutProduct.label "Despre &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
-<!ENTITY productHelp.label "Support and Documentation">
+<!ENTITY productHelp.label "Suport și documentație">
 <!ENTITY productHelp.accesskey "H">
-<!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
+<!ENTITY helpTroubleshootingInfo.label "Informații pentru probleme">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
-<!ENTITY helpFeedbackPage.label "Submit Feedback…">
+<!ENTITY helpFeedbackPage.label "Trimite feedback...">
 <!ENTITY helpFeedbackPage.accesskey "S">
-<!ENTITY helpReportErrors.label "Report Errors to Zotero…">
+<!ENTITY helpReportErrors.label "Raportează erorile la Zotero...">
 <!ENTITY helpReportErrors.accesskey "R">
-<!ENTITY helpCheckForUpdates.label "Check for Updates…">
+<!ENTITY helpCheckForUpdates.label "Caută actualizări...">
 <!ENTITY helpCheckForUpdates.accesskey "U">
diff --git a/chrome/locale/ro-RO/zotero/zotero.dtd b/chrome/locale/ro-RO/zotero/zotero.dtd
index 33d467542d..697e8f2d34 100644
--- a/chrome/locale/ro-RO/zotero/zotero.dtd
+++ b/chrome/locale/ro-RO/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Editare">
 <!ENTITY zotero.general.delete "Ștergere">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Jurnalul de erori poate include mesaje fără legătură cu Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Așteaptă, te rog, ca raportul de eroare să fie trimis.">
 <!ENTITY zotero.errorReport.submitted "Raportul de eroare a fost trimis.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Te rog trimite un mesaj către forumul Zotero (forums.zotero.org) cu acest Raport ID, o descriere a problemei şi orice alt pas necesar pentru a o reproduce.">
 <!ENTITY zotero.errorReport.notReviewed "În mod curent, raporturile de eroare nu sunt luate în considerare atâta timp cât nu se află pe forum.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Ai instalat o nouă versiune de Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Baza de date Zotero trebui actualizată în aşa fel încât să meargă cu noua versiune.">
 <!ENTITY zotero.upgrade.autoBackup "Baza de date existentă va fi salvată automat, înainte să se facă vreo schimbare.">
@@ -30,7 +32,7 @@
 <!ENTITY zotero.contextMenu.saveLinkAsItem "Salvează legătura ca înregistrare în Zotero">
 <!ENTITY zotero.contextMenu.saveImageAsItem "Salvează imaginea ca înregistrare în Zotero">
 
-<!ENTITY zotero.tabs.info.label "Info">
+<!ENTITY zotero.tabs.info.label "Informații">
 <!ENTITY zotero.tabs.notes.label "Note">
 <!ENTITY zotero.tabs.attachments.label "Anexe">
 <!ENTITY zotero.tabs.tags.label "Etichete">
@@ -56,22 +58,38 @@
 <!ENTITY zotero.items.rights_column "Drepturi">
 <!ENTITY zotero.items.dateAdded_column "Data adăugării">
 <!ENTITY zotero.items.dateModified_column "Data modificării">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Afișează în bibliotecă">
 <!ENTITY zotero.items.menu.attach.note "Adaugă notă">
 <!ENTITY zotero.items.menu.attach "Adaugă anexă">
 <!ENTITY zotero.items.menu.attach.snapshot "Anexează un instantaneu al paginii curente">
 <!ENTITY zotero.items.menu.attach.link "Anexează o legătură la pagina curentă">
-<!ENTITY zotero.items.menu.attach.link.uri "Attach Link to URI…">
+<!ENTITY zotero.items.menu.attach.link.uri "Anexează legătură la URI...">
 <!ENTITY zotero.items.menu.attach.file "Anexează copia salvată a fișierului...">
 <!ENTITY zotero.items.menu.attach.fileLink "Anexează o legătură la fișier...">
 
-<!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
+<!ENTITY zotero.items.menu.restoreToLibrary "Restaurează la bibliotecă">
 <!ENTITY zotero.items.menu.duplicateItem "Fă un duplicat înregistrării selectate">
-<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+<!ENTITY zotero.items.menu.mergeItems "Unește itemii...">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
-<!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "Alege versiunea itemului pe care-l folosești ca item master:">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "Selectează câmpurile pentru a le păstra față de alte versiuni ale itemului:">
 
 <!ENTITY zotero.toolbar.newItem.label "Înregistrare nouă">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Mai mult">
@@ -102,11 +120,12 @@
 <!ENTITY zotero.item.attachment.file.show "Arată fișier">
 <!ENTITY zotero.item.textTransform "Transformă text">
 <!ENTITY zotero.item.textTransform.titlecase "Litere de Titlu">
-<!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.textTransform.sentencecase "Majusculă ca la propoziție">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
-<!ENTITY zotero.toolbar.newNote "New Note">
+<!ENTITY zotero.toolbar.newNote "Notă nouă">
 <!ENTITY zotero.toolbar.note.standalone "Notă nouă">
-<!ENTITY zotero.toolbar.note.child "Add Child Note">
+<!ENTITY zotero.toolbar.note.child "Adaugă notă copil">
 <!ENTITY zotero.toolbar.lookup "Caută în funcție de identificator...">
 <!ENTITY zotero.toolbar.attachment.linked "Legătură la fișier...">
 <!ENTITY zotero.toolbar.attachment.add "Memorează copia fișierului...">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Selectează vedere">
 <!ENTITY zotero.tagSelector.clearVisible "Deselectează vedere">
 <!ENTITY zotero.tagSelector.clearAll "Deselectează totul">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Redenumește eticheta...">
 <!ENTITY zotero.tagSelector.deleteTag "Șterge eticheta...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Introdu ISBN, DOI sau PMID pentru a căuta în caseta de mai jos.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Selectează itemi">
 <!ENTITY zotero.selectitems.intro.label "Selectează itemii pe care ai vrea să-i adaugi în biblioteca ta">
@@ -132,9 +159,9 @@
 
 <!ENTITY zotero.bibliography.title "Creează bibliografie">
 <!ENTITY zotero.bibliography.style.label "Stil de citare:">
-<!ENTITY zotero.bibliography.outputMode "Output Mode:">
-<!ENTITY zotero.bibliography.bibliography "Bibliography">
-<!ENTITY zotero.bibliography.outputMethod "Output Method:">
+<!ENTITY zotero.bibliography.outputMode "Mod de ieșire:">
+<!ENTITY zotero.bibliography.bibliography "Bibliografie">
+<!ENTITY zotero.bibliography.outputMethod "Metodă de ieșire:">
 <!ENTITY zotero.bibliography.saveAsRTF.label "Salvează ca RTF">
 <!ENTITY zotero.bibliography.saveAsHTML.label "Salvează ca HTML">
 <!ENTITY zotero.bibliography.copyToClipboard.label "Copiază în memoria clipboard">
@@ -143,12 +170,12 @@
 <!ENTITY zotero.integration.docPrefs.title "Preferințe document">
 <!ENTITY zotero.integration.addEditCitation.title "Adaugă/Editează citarea">
 <!ENTITY zotero.integration.editBibliography.title "Editează bibliografia">
-<!ENTITY zotero.integration.quickFormatDialog.title "Quick Format Citation">
+<!ENTITY zotero.integration.quickFormatDialog.title "Formatare rapidă a citării">
 
 <!ENTITY zotero.progress.title "Progres">
 
 <!ENTITY zotero.exportOptions.title "Export...">
-<!ENTITY zotero.exportOptions.format.label "Format:">
+<!ENTITY zotero.exportOptions.format.label "Formatare:">
 <!ENTITY zotero.exportOptions.translatorOptions.label "Opțiuni translator">
 
 <!ENTITY zotero.charset.label "Codificare caractere">
@@ -162,7 +189,7 @@
 <!ENTITY zotero.citation.suppressAuthor.label "Suprimă autor">
 <!ENTITY zotero.citation.prefix.label "Prefix:">
 <!ENTITY zotero.citation.suffix.label "Sufix:">
-<!ENTITY zotero.citation.editorWarning.label "Warning: If you edit a citation in the editor it will no longer update to reflect changes in your database or the citation style.">
+<!ENTITY zotero.citation.editorWarning.label "Avertisment: Dacă editezi o citare în editor, aceasta nu va mai fi actualizată pentru a reflecta schimbările făcute în baza ta de date sau în stilul de citare.">
 
 <!ENTITY zotero.richText.italic.label "Italic">
 <!ENTITY zotero.richText.bold.label "Bold">
@@ -184,11 +211,11 @@
 <!ENTITY zotero.integration.prefs.bookmarks.label "Semne de carte">
 <!ENTITY zotero.integration.prefs.bookmarks.caption "Semnele de carte sunt protejate în Microsoft Word și OpenOffice, dar pot fi accidental modificate.">
 
-<!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document">
-<!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option.">
+<!ENTITY zotero.integration.prefs.storeReferences.label "Stochează referințele în document">
+<!ENTITY zotero.integration.prefs.storeReferences.caption "Stocarea referințelor în documentul va crește dimensiunea fișierului, dar îți va permite să-l partajezi cu alții fără a folosi un grup Zotero. Este nevoie de Zotero 3.0 sau mai recent pentru a actualiza documentele create cu această opțiune.">
 
-<!ENTITY zotero.integration.showEditor.label "Show Editor">
-<!ENTITY zotero.integration.classicView.label "Classic View">
+<!ENTITY zotero.integration.showEditor.label "Arată editor">
+<!ENTITY zotero.integration.classicView.label "Vizualizare clasică">
 
 <!ENTITY zotero.integration.references.label "Referințe în bibliografie">
 
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Etichetele demarcate nu vor fi salvate.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Eticheta va fi ștearsă din toate înregistrările.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Proxy recunoscut">
 <!ENTITY zotero.proxy.recognized.warning "Adaugă doar servere proxy legate de biblioteca ta, școala ta sau site-ul corporației tale">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Adăugarea altor servere proxy permite site-urilor malițioase să se prezinte drept site-uri de încredere.">
@@ -245,6 +276,6 @@
 <!ENTITY zotero.file.choose.label "Alege fișier...">
 <!ENTITY zotero.file.noneSelected.label "Niciun fișier selectat">
 
-<!ENTITY zotero.downloadManager.label "Save to Zotero">
-<!ENTITY zotero.downloadManager.saveToLibrary.description "Attachments cannot be saved to the currently selected library. This item will be saved to your library instead.">
-<!ENTITY zotero.downloadManager.noPDFTools.description "To use this feature, you must first install the PDF tools in the Zotero preferences.">
+<!ENTITY zotero.downloadManager.label "Salvează în Zotero">
+<!ENTITY zotero.downloadManager.saveToLibrary.description "Anexele nu pot fi salvate în biblioteca selectată. Acest item va fi salvat în schimb în biblioteca ta.">
+<!ENTITY zotero.downloadManager.noPDFTools.description "Pentru a folosi această facilitate, trebuie să instalezi mai întâi uneletele PDF în preferințele Zotero.">
diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties
index 0e0c2a36d7..d9ef5f99e9 100644
--- a/chrome/locale/ro-RO/zotero/zotero.properties
+++ b/chrome/locale/ro-RO/zotero/zotero.properties
@@ -11,9 +11,12 @@ general.restartRequiredForChange=%S trebuie repornit pentru ca schimbarea să ai
 general.restartRequiredForChanges=%S trebuie repornit pentru ca schimbările să aibă efect
 general.restartNow=Repornește acum
 general.restartLater=Repornește mai târziu
-general.restartApp=Restart %S
+general.restartApp=Repornește %S
 general.errorHasOccurred=A intervenit o eroare.
 general.unknownErrorOccurred=A intervenit o eroare necunoscută.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Repornește Firefox, te rog.
 general.restartFirefoxAndTryAgain=Repornește Firefox, te rog, și apoi încearcă din nou.
 general.checkForUpdate=Caută după actualizări
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Vezi %S pentru mai multe informații.
 general.enable=Activare
 general.disable=Dezactivare
 general.remove=Șterge
-general.openDocumentation=Open Documentation
-general.numMore=%S more…
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
+general.openDocumentation=Deschide documentație
+general.numMore=%S mai mult…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=O operațiune Zotero este în momentul de față în desfășurare.
 general.operationInProgress.waitUntilFinished=Te rog să aștepți până se încheie.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Apasă %S pentru a trimite un raport de erori dezvolt
 errorReport.stepsToReproduce=Pași pentru a reproduce:
 errorReport.expectedResult=Rezultat așteptat:
 errorReport.actualResult=Rezultat:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Dosarul de date Zotero nu a fost găsit.
 dataDir.previousDir=Dosarul anterior:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Folosește dosarul de profil din Firefox
 dataDir.selectDir=Selectează un dosar pentru datele Zotero
 dataDir.selectedDirNonEmpty.title=Dosarul nu e gol
 dataDir.selectedDirNonEmpty.text=Dosarul pe care l-ai selectat nu e gol și nu pare a fi un dosar de date Zotero.\n\nCreați totuși fișiere Zotero în acest dosar?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Notificare de Migrare Zotero
 dataDir.standaloneMigration.description=Se pare că e prima dată când folosești %1$S. Vrei ca %1$S să importe setările din %2$S și să folosească dosarul existent de date?
 dataDir.standaloneMigration.multipleProfiles=%1$S își va partaja dosarul de date cu cel mai recent profil de utilizator folosit.
@@ -114,10 +141,11 @@ pane.collections.newSavedSeach=Salvează noua căutare
 pane.collections.savedSearchName=Introdu un nume pentru această căutare salvată:
 pane.collections.rename=Redenumește colecția:
 pane.collections.library=Biblioteca mea
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Coș de gunoi
 pane.collections.untitled=Fără titlu
 pane.collections.unfiled=Înregistrări neîndosariate
-pane.collections.duplicate=Duplicate Items
+pane.collections.duplicate=Duplică itemi
 
 pane.collections.menu.rename.collection=Redenumește colecția...
 pane.collections.menu.edit.savedSearch=Editează căutarea salvată
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Ești sigur că vrei să ștergi această etiche
 pane.tagSelector.numSelected.none=0 etichete selectate
 pane.tagSelector.numSelected.singular=%S etichetă selectată
 pane.tagSelector.numSelected.plural=%S etichete selectate
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Încarcă lista înregistrărilor...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Mută în coșul de gunoi
 pane.items.trash=Sigur vrei să muți înregistrarea selectată în coșul de gunoi?
 pane.items.trash.multiple=Sigur vrei să muți înregistrările selectate în coșul de gunoi?
@@ -176,10 +210,15 @@ pane.items.interview.manyParticipants=Interviu de %S și alții.
 
 pane.item.selected.zero=Nicio înregistrare selectată
 pane.item.selected.multiple=%S înregistrări selectate
-pane.item.unselected.zero=No items in this view
-pane.item.unselected.singular=%S item in this view
-pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+pane.item.unselected.zero=Niciun item în această vizualizare
+pane.item.unselected.singular=%S item în această vizualizare
+pane.item.unselected.plural=%S itemi în această vizualizare
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Schimbă tipul înregistrării
 pane.item.changeType.text=Ești sigur că vrei să schimbi tipul înregistrării?\n\nUrmătoarele câmpuri vor fi pierdute:
@@ -188,8 +227,8 @@ pane.item.defaultLastName=nume
 pane.item.defaultFullName=nume complet
 pane.item.switchFieldMode.one=Comută la un singur câmp
 pane.item.switchFieldMode.two=Comută la două câmpuri
-pane.item.creator.moveUp=Move Up
-pane.item.creator.moveDown=Move Down
+pane.item.creator.moveUp=Mută în sus
+pane.item.creator.moveDown=Mută în jos
 pane.item.notes.untitled=Notă fără titlu
 pane.item.notes.delete.confirm=Sigur vrei să ștergi această notă?
 pane.item.notes.count.zero=%S note:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S anexe:
 pane.item.attachments.count.singular=%S anexă:
 pane.item.attachments.count.plural=%S anexe:
 pane.item.attachments.select=Selectează un fișier
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=clic aici
-pane.item.tags=Etichete:
 pane.item.tags.count.zero=%S etichete:
 pane.item.tags.count.singular=%S etichetă:
 pane.item.tags.count.plural=%S etichete:
 pane.item.tags.icon.user=Etichetă adăugată de utilizator
 pane.item.tags.icon.automatic=Etichetă adăugată automat
-pane.item.related=Relații:
 pane.item.related.count.zero=%S relații:
 pane.item.related.count.singular=%S relație:
 pane.item.related.count.plural=%S relații:
@@ -311,7 +351,7 @@ itemFields.artworkMedium=Mediu
 itemFields.number=Număr
 itemFields.artworkSize=Mărime lucrare de artă
 itemFields.libraryCatalog=Catalog bibliotecă
-itemFields.videoRecordingFormat=Format
+itemFields.videoRecordingFormat=Formatare
 itemFields.interviewMedium=Mediu
 itemFields.letterType=Tip (scrisoare)
 itemFields.manuscriptType=Tip (manuscris)
@@ -319,7 +359,7 @@ itemFields.mapType=Tip (hartă)
 itemFields.scale=Scală
 itemFields.thesisType=Tip (teză)
 itemFields.websiteType=Tip de site web
-itemFields.audioRecordingFormat=Format
+itemFields.audioRecordingFormat=Formatare
 itemFields.label=Etichetă
 itemFields.presentationType=Tip (prezentare)
 itemFields.meetingName=Nume de contact
@@ -367,7 +407,7 @@ itemFields.programTitle=Titlu program
 itemFields.issuingAuthority=Autoritate emitentă
 itemFields.filingDate=Dată depozitare
 itemFields.genre=Gen
-itemFields.archive=Archive
+itemFields.archive=Arhivă
 
 creatorTypes.author=Autor
 creatorTypes.contributor=Colaborator
@@ -409,28 +449,30 @@ fileTypes.document=Document
 
 save.attachment=Salvează instantaneu...
 save.link=Salvează legătură...
-save.link.error=An error occurred while saving this link.
-save.error.cannotMakeChangesToCollection=You cannot make changes to the currently selected collection.
-save.error.cannotAddFilesToCollection=You cannot add files to the currently selected collection.
+save.link.error=A apărut o eroare în timp ce se salva această legătură.
+save.error.cannotMakeChangesToCollection=Nu poți face schimbări în colecția selectată în prezent.
+save.error.cannotAddFilesToCollection=Nu poți adăuga fișiere în colecția selectată în acest moment.
 
 ingester.saveToZotero=Salvează în Zotero
-ingester.saveToZoteroUsing=Save to Zotero using "%S"
+ingester.saveToZoteroUsing=Salvezi în Zotero folosind "%S"
 ingester.scraping=Salvează înregistrarea...
+ingester.scrapingTo=Saving to
 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.scrapeErrorDescription.previousError=Procesul de salvare a eșuat din cauza unei erori anterioare din Zotero.
 
-ingester.importReferRISDialog.title=Zotero RIS/Refer Import
+ingester.importReferRISDialog.title=Import Zotero RIS/Refer
 ingester.importReferRISDialog.text=Vrei să imporți înregistrări din "%1$S" în Zotero?\n\nPoți dezactiva importarea automată a fișierelor RIS/Refer din preferințele Zotero.
 ingester.importReferRISDialog.checkMsg=Permite întotdeauna pentru acest site
 
-ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.title=Importă fișier
+ingester.importFile.text=Vrei să imporți fișierul "%S"?\n\nItemii vor fi adăugați într-o nouă colecție.
+ingester.importFile.intoNewCollection=Import into new collection
 
-ingester.lookup.performing=Performing Lookup…
-ingester.lookup.error=An error occurred while performing lookup for this item.
+ingester.lookup.performing=Execută o căutare...
+ingester.lookup.error=A apărut o eroare în timpul executării căutării pentru acest item.
 
 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 ultima copie de siguranță.
@@ -441,20 +483,33 @@ db.dbRestoreFailed=Baza de date '%S' din Zotero pare coruptă și încercarea de
 db.integrityCheck.passed=Nicio eroare nu a fost găsită în baza de date.
 db.integrityCheck.failed=Au fost găsite erori în baza de date Zotero!
 db.integrityCheck.dbRepairTool=Pentru a încerca să corectezi aceste erori, poți folosi instrumentul de reparare al bazei de date la http://zotero.org/utils/dbfix.
-db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
-db.integrityCheck.appRestartNeeded=%S will need to be restarted.
-db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
-db.integrityCheck.errorsFixed=The errors in your Zotero database have been corrected.
-db.integrityCheck.errorsNotFixed=Zotero was unable to correct all the errors in your database.
-db.integrityCheck.reportInForums=You can report this problem in the Zotero Forums.
+db.integrityCheck.repairAttempt=Zotero poate încerca să corecteze aceste erori.
+db.integrityCheck.appRestartNeeded=%S va avea nevoie de repornire.
+db.integrityCheck.fixAndRestart=Fixează erorile și repornește %S
+db.integrityCheck.errorsFixed=Erorile din baza ta de date Zotero au fost corectate.
+db.integrityCheck.errorsNotFixed=Zotero nu a fost în stare să corecteze toate erorile din baza ta de date.
+db.integrityCheck.reportInForums=Poți raporta această problemă pe forumul Zotero.
 
 zotero.preferences.update.updated=Actualizat
 zotero.preferences.update.upToDate=Actualizat
 zotero.preferences.update.error=Eroare
-zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when possible
+zotero.preferences.launchNonNativeFiles=Deschide PDFs și alte fișiere în %S când e posibil
 zotero.preferences.openurl.resolversFound.zero=Au fost găsiți %S rezolvatori
 zotero.preferences.openurl.resolversFound.singular=A fost găsit %S rezolvator
 zotero.preferences.openurl.resolversFound.plural=Au fost găsiți %S rezolvatori
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Reconstruire index
 zotero.preferences.search.rebuildWarning=Vrei să reconstruiești întregul index? Asta poate dura ceva timp.\n\nPentru a indexa doar înregistrările care nu au fost indexate, folosește %S.
 zotero.preferences.search.clearIndex=Golire index
@@ -481,7 +536,7 @@ zotero.preferences.search.pdf.tryAgainOrViewManualInstructions=Încearcă, te ro
 zotero.preferences.export.quickCopy.bibStyles=Stiluri bibliografice
 zotero.preferences.export.quickCopy.exportFormats=Exportă formate
 zotero.preferences.export.quickCopy.instructions=Copierea rapidă îți permite să selectezi referințele în memoria clipboard apăsând scurtătura de la tastatură (%S) sau trăgând înregistrările pe o pagină web, într-o casetă de text.
-zotero.preferences.export.quickCopy.citationInstructions=For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
+zotero.preferences.export.quickCopy.citationInstructions=Pentru stilurile bibliografice, poți copia citări sau note de subsol apăsând %S sau ținând apăsată tasta Shift înainte de a trage itemii.
 zotero.preferences.styles.addStyle=Adaugă stil
 
 zotero.preferences.advanced.resetTranslatorsAndStyles=Resetează traducătorii și stilurile
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Toți traducătorii noi
 zotero.preferences.advanced.resetStyles=Resetează stiluri
 zotero.preferences.advanced.resetStyles.changesLost=Toate stilurile noi sau modificate vor fi pierdute
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Fișierele următoare există deja în dosarul de destinație și nu au fost copiate:
 dragAndDrop.filesNotFound=Următoarele fișiere nu au fost găsite și nu pot fi copiate:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importă
 fileInterface.export=Exportă
 fileInterface.exportedItems=Înregistrări exportate
 fileInterface.imported=Importate
-fileInterface.fileFormatUnsupported=Niciun translator nu a fost găsit pentru fișierul dat.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Bibliografie fără titlu
 fileInterface.bibliographyHTMLTitle=Bibliografie
 fileInterface.importError=A apărut o eroare în timpul importării fișierului selectat. Asigură-te, te rog, că fișierul e valid și încearcă din nou.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Înregistrările selectate nu conțin referințe
 fileInterface.bibliographyGenerationError=A apărut o eroare la generarea bibliografiei tale. Încearcă, te rog, din nou.
 fileInterface.exportError=A apărut o eroarea în timpul exportării fișierului selectat.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Mod de căutare avansată – apasă Enter pentru a căuta.
 searchInProgress=Căutare în progres – așteaptă, te rog.
 
@@ -556,7 +620,7 @@ fulltext.indexState.partial=Parțial
 
 exportOptions.exportNotes=Exportă note
 exportOptions.exportFileData=Exportă fișiere
-exportOptions.useJournalAbbreviation=Use Journal Abbreviation
+exportOptions.useJournalAbbreviation=Folosește abreviere revistă
 charset.UTF8withoutBOM=Unicode (UTF-8 fără BOM)
 charset.autoDetect=(detectare automată)
 
@@ -572,8 +636,8 @@ citation.multipleSources=Surse multiple...
 citation.singleSource=O singură sursă...
 citation.showEditor=Afișează editor...
 citation.hideEditor=Ascunde editor...
-citation.citations=Citations
-citation.notes=Notes
+citation.citations=Citări
+citation.notes=Note
 
 report.title.default=Raport Zotero
 report.parentItem=Înregistrare părinte:
@@ -608,11 +672,12 @@ integration.revert.button=Revenire la starea precedentă
 integration.removeBibEntry.title=Referințele selectate sunt citate în documentul tău.
 integration.removeBibEntry.body=Ești sigur că vrei să omiți această intrare din bibliografia ta?
 
-integration.cited=Cited
-integration.cited.loading=Loading Cited Items…
-integration.ibid=ibid
+integration.cited=Citat
+integration.cited.loading=Încarcă itemii citați...
+integration.ibid=ibidem
 integration.emptyCitationWarning.title=Citare goală
 integration.emptyCitationWarning.body=Citarea pe care ai specificat-o este goală în stilul curent selectat. Ești sigur că vrei să o adaugi?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Această versiune a plugin-ului pentru procesorul de texte ($INTEGRATION_VERSION) este incompatibilă cu versiunea curentă instalată a extensiei Firefox Zotero (%1$S). Asigură-te, te rog, că folosești ultimele versiuni ale ambelor componente.
 integration.error.incompatibleVersion2=Zotero %1$S are  nevoie de %2$S %3$S sau mai nou. Te rog să descarci ultima versiune de %2$S de la zotero.org.
@@ -625,8 +690,8 @@ integration.error.cannotInsertHere=Câmpurile Zotero nu pot fi inserate aici.
 integration.error.notInCitation=Trebuie să plasezi cursorul într-o citare Zotero, pentru a o edita.
 integration.error.noBibliography=Stilul bibliografic curent nu are definită o bibliografie. Dacă vrei să adaugi o bibliografie, te rog să alegi un alt stil.
 integration.error.deletePipe=Legătura pe care Zotero o folosește pentru a comunica cu procesorul de text nu a putut fi inițializată. Vrei ca Zotero să încerce să corecteze această eroare? Ți se va cere parola.
-integration.error.invalidStyle=The style you have selected does not appear to be valid. If you have created this style yourself, please ensure that it passes validation as described at https://github.com/citation-style-language/styles/wiki/Validation. Alternatively, try selecting another style.
-integration.error.fieldTypeMismatch=Zotero cannot update this document because it was created by a different word processing application with an incompatible field encoding. In order to make a document compatible with both Word and OpenOffice.org/LibreOffice/NeoOffice, open the document in the word processor with which it was originally created and switch the field type to Bookmarks in the Zotero Document Preferences.
+integration.error.invalidStyle=Stilul pe care l-ai selectat nu pare a fi valid. Dacă tu ești creatorul acestui stil, te rog asigură-te că trece validarea, așa cum e descris la https://github.com/citation-style-language/styles/wiki/Validation. Ca alternativă, încearcă să selectezi un alt stil.
+integration.error.fieldTypeMismatch=Zotero nu poate actualiza acest document pentru că a fost creat cu un procesor de texte diferit, cu o codare a câmpului incompatibilă. Pentru a face un document compatibil atât cu Word cât și cu OpenOffice.org/LibreOffice/NeoOffice, deschide documentul în procesorul de text cu care a fost original creat și schimbă tipul de câmp la Bookmarks în Preferințele Documentului Zotero.
 
 integration.replace=Înlocuiesc acest câmp Zotero?
 integration.missingItem.single=Acest item nu mai există în baza ta de date Zotero. Vrei să selectezi un item înlocuitor?
@@ -639,18 +704,26 @@ integration.corruptField=Codul de câmp Zotero corespunzător acestei citări, c
 integration.corruptField.description=Dacă se apasă „Nu” va fi șters câmpul codificat pentru citările care conțin această înregistrare, păstrând textul citării, dar ștergând-o din bibliografia ta.
 integration.corruptBibliography=Câmpul codificat din Zotero pentru bibliografia ta este corupt. Ar trebui ca Zotero să golească acest câmp codificat și să genereze o nouă bibliografie?
 integration.corruptBibliography.description=Toate înregistrările citate în text vor apărea în noua bibliografie, dar modificările făcute în caseta de dialog „Editare bibliografie” vor fi pierdute.
-integration.citationChanged=You have modified this citation since Zotero generated it. Do you want to keep your modifications and prevent future updates?
-integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
-integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
+integration.citationChanged=Ai modificat această citare de când Zotero a generat-o. Vrei să-ți păstrezi modificările și să previi viitoarele actualizări?
+integration.citationChanged.description=Dacă apeși pe "Da", Zotero va fi împiedicat să actualizeze această citare, atunci când adaugi și alte citări, schimbi stilurile sau modifici itemul la care se referă. Dacă apeși pe "Nu", schimbările tale vor fi șterse.
+integration.citationChanged.edit=Ai modificat această citare de când Zotero a generat-o. Editarea va șterge modificările tale. Vrei să continui?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Să instalez stilul "%1$S" de la %2$S?
 styles.updateStyle=Să actualizez stilul "%1$S" cu "%2$S" de la %3$S?
 styles.installed=Stilul "%S" a fost instalat cu succes.
 styles.installError=%S nu pare a fi un fișier de stil valid.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S se referă la un fișier CSL invalid sau non-existent la %2$S ca sursă a lui.
 styles.deleteStyle=Sigur vrei să ștergi stilul "%1$S"?
 styles.deleteStyles=Sigur vrei să ștergi stilul selectat?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Abanonare sincronizare
 sync.openSyncPreferences=Deschide Preferințe pentru sincronizare...
 sync.resetGroupAndSync=Resetează Grup și Sincronizare
@@ -660,8 +733,10 @@ sync.remoteObject=Obiect la distanță
 sync.mergedObject=Obiect unificat
 
 sync.error.usernameNotSet=Nume de utilizator neconfigurat
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Parolă neconfigurată
 sync.error.invalidLogin=Nume de utilizator sau parolă invalide
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Te rog să introduci o parolă.
 sync.error.loginManagerCorrupted1=Zotero nu poate accesa informațiile tale de autentificare, din pricina coruperii unei baze de date a managerului de autentificare din Firefox.
 sync.error.loginManagerCorrupted2=Închide Firefox, creează o copie de siguranță și șterge signons.* din profilul tău Firefox; apoi reintrodu informația ta de autentificare Zotero în panoul sincronizării al preferințelor Zotero.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Dacă vei continua, copia ta pentru grup va fi reset
 sync.error.copyChangedItems=Dacă vrei să-ți copiezi modificările altundeva sau să ceri permisiuni de scriere de la un grup de administratori, renunță la sincronizare acum.
 sync.error.manualInterventionRequired=O sincronizare automată a dus la un conflict care are nevoie de intervenție manuală.
 sync.error.clickSyncIcon=Apasă clic pe iconița de sincronizare pentru a executa o sincronizare manuală.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Fără sincronizare încă
 sync.status.lastSync=Ultima sincronizare:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Încarcă datele pe serverul de sincronizare
 sync.status.uploadAccepted=Încărcare acceptată — caută serverul de sincronizare
 sync.status.syncingFiles=Sincronizează fișierele
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB rămași
 sync.storage.filesRemaining=%1$S/%2$S fișiere
 sync.storage.none=Nimic
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Fișier local
 sync.storage.remoteFile=Fișier la distanță
 sync.storage.savedFile=Fișier salvat
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Configurările de server verificate
 sync.storage.fileSyncSetUp=Sincronizarea fișierelor a fost configurată cu succes.
 sync.storage.openAccountSettings=Deschide configurări de cont
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Serverul %S nu poate fi găsit.
 sync.storage.error.permissionDeniedAtAddress=Nu ai permisiunea să creezi un dosar Zotero la adresa următoare:
 sync.storage.error.checkFileSyncSettings=Te rog să verifici configurările de sincronizare a fișierelor sau să contactezi administratorul serverului tău.
 sync.storage.error.verificationFailed=Eroare la verificarea %S. Verifică-ți configurările de sincronizare a fișierelor în panoul Sincronizare din preferințele Zotero.
 sync.storage.error.fileNotCreated=Fișierul '%S' nu poate fi creat în directorul Zotero 'storage' (depozit).
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Nu mai ai permisiuni de editare a fișierelor în grupul Zotero '%S', de aceea fișierele pe care le-ai adăugat sau editat nu pot fi sincronizate cu serverul.
 sync.storage.error.copyChangedItems=Dacă vrei să copiezi altundeva înregistrările modificate și fișierele, renunță la sincronizare acum.
 sync.storage.error.fileUploadFailed=Eroare la încărcarea fișierului
 sync.storage.error.directoryNotFound=Dosarul nu a fost găsit
 sync.storage.error.doesNotExist=%S nu există.
 sync.storage.error.createNow=Vrei să-l creezi acum?
-sync.storage.error.webdav.enterURL=Te rog să introduci un URL WebDAV.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S nu este un URL WebDAV valid.
 sync.storage.error.webdav.invalidLogin=Serverul WebDAV nu acceptă numele de utilizator și parola pe care le-ai introdus.
 sync.storage.error.webdav.permissionDenied=Nu ai permisiunea să accesezi %S pe serverul WebDAV.
@@ -711,12 +830,19 @@ sync.storage.error.webdav.insufficientSpace=Încărcarea unui fișier a eșuat d
 sync.storage.error.webdav.sslCertificateError=Eroare de certificare SSL la conectarea cu %S.
 sync.storage.error.webdav.sslConnectionError=Eroare de conectare SSL la conectarea cu %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Încarcă-ți URL-ul WebDAV în browser pentru mai multe informații.
-sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
-sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.seeCertOverrideDocumentation=Pentru mai multe informații, vezi documentația pentru suprascrierea certificatului.
+sync.storage.error.webdav.loadURL=Încarcă WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Ai atins limita ta maximă de stocare a fișierelor în Zotero. Unele fișiere nu au fost încărcate. Alte date Zotero vor continua să se sincronizeze cu serverul.
 sync.storage.error.zfs.personalQuotaReached2=Vezi configurările contului tău zotero.org pentru opțiuni de stocare adiționale.
 sync.storage.error.zfs.groupQuotaReached1=Grupul '%S' a atins limita sa maximă de stocare a fișierelor în Zotero. Unele fișiere nu au fost încărcate. Alte date Zotero vor continua să se sincronizeze cu serverul.
 sync.storage.error.zfs.groupQuotaReached2=Grupul proprietar poate crește capacitate de stocare din secțiunea configurărilor de stocare de la zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Salvare etichetă
 sync.longTagFixer.saveTags=Salvare etichete
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Nu s-a putut citi textul din PDF.
 recognizePDF.noMatches=Nu s-a găsit nicio referință care să se potrivească.
 recognizePDF.fileNotFound=Fișierul nu a fost găsit.
 recognizePDF.limit=S-a ajuns la limita de interogare. Încearcă din nou mai târziu.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Extragerea metadatelor completă.
 recognizePDF.close.label=Închide
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Selectează o locație în care să salvezi fișierul formatat
 rtfScan.scannedFileSuffix=(Scanat)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Eroare la căutare
 lookup.failure.description=Zotero nu a putut găsi o înregistrare pentru identificatorul specificat. Verifică te rog identificatorul și încearcă din nou.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Vezi online
 locate.online.tooltip=Mergi la acest item online
@@ -774,14 +914,14 @@ locate.libraryLookup.label=Căutare de informații în bibliotecă
 locate.libraryLookup.tooltip=Caută acest item folosind rezolvatorul selectat OpenURL
 locate.manageLocateEngines=Administrează motoarele de căutare de informații...
 
-standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
-standalone.addonInstallationFailed.title=Add-on Installation Failed
-standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
+standalone.corruptInstallation=Instalarea ta a programului Zotero Standalone pare a fi coruptă datorită unei erori de autoactualizare. Chiar dacă Zotero ar putea funcționa, pentru a evida potențialele erori, te rog să descarci ultima versiune a programului Zotero Standalone de la  http://zotero.org/support/standalone cât mai curând posibil.
+standalone.addonInstallationFailed.title=Instalarea extensiei a eșuat
+standalone.addonInstallationFailed.body=Extensia "%S" nu a putut fi instalată. Poate că este incompatibilă cu această versiune a programului Zotero Standalone.
 
-connector.error.title=Zotero Connector Error
-connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
+connector.error.title=Eroare la conectorul Zotero
+connector.standaloneOpen=Baza ta de date nu poate fi accesată fiindcă Zotero Standalone este deschis. Te rog să-ți vizualizezi itemii în Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
-firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
-firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-\u2193 to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
-firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-\u2193 to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.saveIcon=Zotero a găsit o referință pe această pagină. Fă clic pe această iconiță din bara de adrese pentru a salva referința în biblioteca ta Zotero.
+firstRunGuidance.authorMenu=Zotero îți permite, de asemenea, să specifici editorii și traducătorii. Poți să schimbi un autor într-un editor sau traducător făcând o selecție în acest meniu. 
+firstRunGuidance.quickFormat=Tastează un titlu sau un autor pentru a căuta o referință.\n\nDupă ce ai făcut selecția pe care o dorești, apasă bula sau  Ctrl-↓ pentru a adăuga numere de pagină, prefixe sau sufixe. Poți, de asemenea, să incluzi un număr de pagină odată cu căutarea termenilor pentru a-l adăuga direct.\n\nPoți modifica citările direct în documentul din procesorul de texte.
+firstRunGuidance.quickFormatMac=Tastează un titlu sau un autor pentru a căuta o referință.\n\nDupă ce ai făcut selecția pe care o dorești, apasă bula sau Cmd-↓ pentru a adăuga numere de pagină, prefixe sau sufixe. Poți, de asemenea, să incluzi numărul de pagină odată cu căutarea termenilor, pentru a-l adăuga direct.\n\nPoți modifica citările direct în documentul din procesorul de texte.
diff --git a/chrome/locale/ru-RU/zotero/about.dtd b/chrome/locale/ru-RU/zotero/about.dtd
index 829a9756f0..f310418558 100644
--- a/chrome/locale/ru-RU/zotero/about.dtd
+++ b/chrome/locale/ru-RU/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Особая благодарность:">
 <!ENTITY zotero.about.close "Закрыть">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Дополнительные ">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/ru-RU/zotero/preferences.dtd b/chrome/locale/ru-RU/zotero/preferences.dtd
index 72073f30c4..e26ea65abe 100644
--- a/chrome/locale/ru-RU/zotero/preferences.dtd
+++ b/chrome/locale/ru-RU/zotero/preferences.dtd
@@ -3,16 +3,17 @@
 <!ENTITY zotero.preferences.default "По умолчанию:">
 <!ENTITY zotero.preferences.items "документа(-ов)">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Общие">
 
 <!ENTITY zotero.preferences.userInterface "Интерфейс">
 <!ENTITY zotero.preferences.showIn "Открывать Zotero в:">
-<!ENTITY zotero.preferences.showIn.browserPane "Текущей панеле">
+<!ENTITY zotero.preferences.showIn.browserPane "Текущей панели">
 <!ENTITY zotero.preferences.showIn.separateTab "Отдельной вкладке">
-<!ENTITY zotero.preferences.showIn.appTab "Вкладка приложения">
+<!ENTITY zotero.preferences.showIn.appTab "Вкладке приложения">
 <!ENTITY zotero.preferences.statusBarIcon "Вид в строке состояния:">
-<!ENTITY zotero.preferences.statusBarIcon.none "Ничего">
+<!ENTITY zotero.preferences.statusBarIcon.none "Нет">
 <!ENTITY zotero.preferences.fontSize "Размер шрифта:">
 <!ENTITY zotero.preferences.fontSize.small "Маленький">
 <!ENTITY zotero.preferences.fontSize.medium "Средний">
@@ -38,7 +39,7 @@
 <!ENTITY zotero.preferences.groups.childNotes "дочерние заметки">
 <!ENTITY zotero.preferences.groups.childFiles "дочерние снимки и импортированные файлы">
 <!ENTITY zotero.preferences.groups.childLinks "дочерние ссылки">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "теги">
 
 <!ENTITY zotero.preferences.openurl.caption "OpenURL">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Синхронизировать файлы приложений в Моей Библиотеке, используя:">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Синхронизировать файлы приложений в групповых библиотеках, используя хранилище Zotero">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Используя хранилище Zotero, вы соглашаетесь быть связанными его">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "условиями использования">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Полная синхронизация с сервером Zotero">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Объединить локальные данные Zotero c данными с сервера, игнорируя историю синхронизации">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Восстановить с сервера Zotero">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Удалить все данные на сервере и перезаписать их локальными данными Zotero">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Сбросить историю синхронизации файлов">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Осуществить принудительную проверку наличия в хранилище сервера всех локальных файлов приложений">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Сбросить…">
 
 
@@ -114,13 +121,14 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Название">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Обновлён">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Загрузить дополнительные стили…">
 
 <!ENTITY zotero.preferences.prefpane.keys "Горячие клавиши">
 
 <!ENTITY zotero.preferences.keys.openZotero "Открыть/закрыть панель Zotero">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Переключение полноэкранного режима">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "Фокус на панели библиотек">
 <!ENTITY zotero.preferences.keys.quicksearch "Быстрый поиск">
 <!ENTITY zotero.preferences.keys.newItem "Создать новый документ">
 <!ENTITY zotero.preferences.keys.newNote "Создать новую заметку">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - любая строка">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Расширенные">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Обнаружение">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Диспетчер систем поиска статей">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Выбрать…">
 <!ENTITY zotero.preferences.dataDir.reveal "Показать папку с данными">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Поддержка БД">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Проверить целостность БД">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Обнулить трансляторы и стили…">
diff --git a/chrome/locale/ru-RU/zotero/standalone.dtd b/chrome/locale/ru-RU/zotero/standalone.dtd
index 5c38368454..0f7a288841 100644
--- a/chrome/locale/ru-RU/zotero/standalone.dtd
+++ b/chrome/locale/ru-RU/zotero/standalone.dtd
@@ -12,12 +12,12 @@
 
 <!ENTITY fileMenu.label "Файл">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "Сохранить...">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
+<!ENTITY pageSetupCmd.label "Параметры печати...">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "Печать...">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "U">
 <!ENTITY closeCmd.label "Закрыть">
diff --git a/chrome/locale/ru-RU/zotero/zotero.dtd b/chrome/locale/ru-RU/zotero/zotero.dtd
index 07d5abe88c..92bf3aecd6 100644
--- a/chrome/locale/ru-RU/zotero/zotero.dtd
+++ b/chrome/locale/ru-RU/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Редактировать">
 <!ENTITY zotero.general.delete "Удалить">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Журнал ошибок может содержать сообщения не относящиеся к Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Подождите, пока отчет об ошибке будет отослан.">
 <!ENTITY zotero.errorReport.submitted "Отчет об ошибке отослан.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Пожалуйста, оставьте сообщение на форуме Zotero (forums.zotero.org), указав этот номер отчета, описание проблемы, и какие шаги нужно предпринять чтобы повторить ее.">
 <!ENTITY zotero.errorReport.notReviewed "Отчеты об ошибках не рассматриваются, пока на них не сослались в форуме.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Вы установили новую версию Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Ваша база данных Zotero должна быть обновлена для работы с новой версией.">
 <!ENTITY zotero.upgrade.autoBackup "Резервная копия вашей базы данных Zotero будет сделана автоматически до каких-либо изменений.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Права">
 <!ENTITY zotero.items.dateAdded_column "Добавлен">
 <!ENTITY zotero.items.dateModified_column "Изменён">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Показать в библиотеке">
 <!ENTITY zotero.items.menu.attach.note "Добавить заметку">
@@ -68,10 +86,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Восстановить в библиотеке">
 <!ENTITY zotero.items.menu.duplicateItem "Сделать дубликат выбранного документа">
-<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+<!ENTITY zotero.items.menu.mergeItems "Объединить документы...">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
-<!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "Выберите версию документа для использования в качестве главной">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "Выберите поля для сохранения из других версий документа">
 
 <!ENTITY zotero.toolbar.newItem.label "Новый документ">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Далее">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Трансформировать Текст">
 <!ENTITY zotero.item.textTransform.titlecase "Каждое Слово с Заглавной">
 <!ENTITY zotero.item.textTransform.sentencecase "Как в предложении">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Новая заметка">
 <!ENTITY zotero.toolbar.note.standalone "Новая отдельная заметка">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Выбрать видимые">
 <!ENTITY zotero.tagSelector.clearVisible "Отменить выбор видимых">
 <!ENTITY zotero.tagSelector.clearAll "Отменить выбор">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Переименовать тег…">
 <!ENTITY zotero.tagSelector.deleteTag "Удалить тег…">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Введите ISBN, DOI или PMID для поиска в следующее поле.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Выбрать документы">
 <!ENTITY zotero.selectitems.intro.label "Выбрать, какие документы вы хотите добавить в свою библиотеку">
@@ -132,9 +159,9 @@
 
 <!ENTITY zotero.bibliography.title "Создать библиографию">
 <!ENTITY zotero.bibliography.style.label "Стиль цитирования:">
-<!ENTITY zotero.bibliography.outputMode "Output Mode:">
-<!ENTITY zotero.bibliography.bibliography "Bibliography">
-<!ENTITY zotero.bibliography.outputMethod "Output Method:">
+<!ENTITY zotero.bibliography.outputMode "Режим вывода:">
+<!ENTITY zotero.bibliography.bibliography "Библиография">
+<!ENTITY zotero.bibliography.outputMethod "Метод вывода:">
 <!ENTITY zotero.bibliography.saveAsRTF.label "Сохранить как RTF">
 <!ENTITY zotero.bibliography.saveAsHTML.label "Сохранить как HTML">
 <!ENTITY zotero.bibliography.copyToClipboard.label "Скопировать в буфер обмена">
@@ -143,7 +170,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Параметры документа">
 <!ENTITY zotero.integration.addEditCitation.title "Добавить/редактировать цитату">
 <!ENTITY zotero.integration.editBibliography.title "Редактировать библиографию">
-<!ENTITY zotero.integration.quickFormatDialog.title "Quick Format Citation">
+<!ENTITY zotero.integration.quickFormatDialog.title "Быстрое форматирование цитаты">
 
 <!ENTITY zotero.progress.title "Ход выполнения">
 
@@ -162,7 +189,7 @@
 <!ENTITY zotero.citation.suppressAuthor.label "Убрать автора">
 <!ENTITY zotero.citation.prefix.label "Префикс:">
 <!ENTITY zotero.citation.suffix.label "Суффикс:">
-<!ENTITY zotero.citation.editorWarning.label "Warning: If you edit a citation in the editor it will no longer update to reflect changes in your database or the citation style.">
+<!ENTITY zotero.citation.editorWarning.label "Предупреждение: Если вы измените цитату в редакторе, она больше не будет обновляться в соответствии с изменениями в базе данных или стиле цитирования">
 
 <!ENTITY zotero.richText.italic.label "Курсив">
 <!ENTITY zotero.richText.bold.label "Полужирный">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Неотмеченные теги не будут сохранены.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Тег будет удалён из всех документов.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Прокси определён">
 <!ENTITY zotero.proxy.recognized.warning "Добавляйте только прокси, предоставляемые вашей библиотекой, учебным заведением или корпоративным сайтом.">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Использование других прокси позволит злонамеренным сайтам маскироваться под сайты, которым вы доверяете.">
diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties
index e481d021b2..c624dbab85 100644
--- a/chrome/locale/ru-RU/zotero/zotero.properties
+++ b/chrome/locale/ru-RU/zotero/zotero.properties
@@ -11,9 +11,12 @@ general.restartRequiredForChange=Требуется перезапуск %S, ч
 general.restartRequiredForChanges=Требуется перезапуск %S, чтобы изменения вступили в силу.
 general.restartNow=Перезапустить сейчас
 general.restartLater=Перезапустить позже
-general.restartApp=Restart %S
+general.restartApp=Перезапуск %S
 general.errorHasOccurred=Произошла ошибка.
 general.unknownErrorOccurred=Произошла неизвестная ошибка.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Перезапустите Firefox.
 general.restartFirefoxAndTryAgain=Перезапустите Firefoх и попробуйте снова.
 general.checkForUpdate=Проверить наличие обновлений
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Смотрите %S для дополнитель
 general.enable=Включить
 general.disable=Выключить
 general.remove=Убрать
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Открыть документацию
-general.numMore=%S more…
+general.numMore=%S подробнее…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=В настоящий момент Zotero выполняет действие.
 general.operationInProgress.waitUntilFinished=Пожалуйста, подождите, пока оно закончится.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Нажмите %S, чтобы послать отче
 errorReport.stepsToReproduce=Предпринимаемые Шаги:
 errorReport.expectedResult=Ожидаемый результат:
 errorReport.actualResult=Реальный результат:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Папка с данными Zotero не найдена.
 dataDir.previousDir=Предыдущая папка:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Использовать папку с профилем Fi
 dataDir.selectDir=Выберите папку с данными Zotero
 dataDir.selectedDirNonEmpty.title=Папка не пуста
 dataDir.selectedDirNonEmpty.text=Папка, которую Вы выбрали не пуста и не является папкой с данными Zotero.\n\n Тем не менее, создать файлы Zotero в этой папке?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Сообщение Zotero о миграции
 dataDir.standaloneMigration.description=Кажется, вы используете %1$S в первый раз. Желаете ли вы, чтобы %1$S импортировало настройки из %2$S и использовало существующую папку с вашими данными?
 dataDir.standaloneMigration.multipleProfiles=%1$S будет использовать папку с данными совместно с последним используемым профилем.
@@ -114,10 +141,11 @@ pane.collections.newSavedSeach=Новый сохраненный поиск
 pane.collections.savedSearchName=Введите имя для этого сохраненного поиска:
 pane.collections.rename=Переименовать подборку:
 pane.collections.library=Моя библиотека
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Корзина
 pane.collections.untitled=Неназванные
 pane.collections.unfiled=Неподшитые
-pane.collections.duplicate=Duplicate Items
+pane.collections.duplicate=Дубликаты документов
 
 pane.collections.menu.rename.collection=Переименовать подборку…
 pane.collections.menu.edit.savedSearch=Редактировать сохраненный поиск
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Вы уверены, что хотите уда
 pane.tagSelector.numSelected.none=Выбрано 0 тегов
 pane.tagSelector.numSelected.singular=Выбран %S тег
 pane.tagSelector.numSelected.plural=Выбрано %S тега(-ов)
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Загружается список документов…
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Поместить в Корзину
 pane.items.trash=Вы уверены, что хотите поместить выбранный документ в Корзину?
 pane.items.trash.multiple=Вы уверены, что хотите поместить выбранные документы в Корзину?
@@ -176,10 +210,15 @@ pane.items.interview.manyParticipants=Интервью %S и др.
 
 pane.item.selected.zero=Нет выбранных документов
 pane.item.selected.multiple=Выбрано %S документа(-ов).
-pane.item.unselected.zero=No items in this view
-pane.item.unselected.singular=%S item in this view
-pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+pane.item.unselected.zero=Нет документов для отображения
+pane.item.unselected.singular=%S документ отображен
+pane.item.unselected.plural=%S документов отображено
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Изменить тип документа
 pane.item.changeType.text=Вы уверены, что хотите изменить тип документа?\n\nСледующие поля будут утрачены:
@@ -188,8 +227,8 @@ pane.item.defaultLastName=фамилия
 pane.item.defaultFullName=полное имя
 pane.item.switchFieldMode.one=Переключиться на одно поле
 pane.item.switchFieldMode.two=Переключиться на два поля
-pane.item.creator.moveUp=Move Up
-pane.item.creator.moveDown=Move Down
+pane.item.creator.moveUp=Переместить вверх
+pane.item.creator.moveDown=Переместить вниз
 pane.item.notes.untitled=Заметка без названия
 pane.item.notes.delete.confirm=Вы уверены, что хотите удалить эту заметку?
 pane.item.notes.count.zero=%S заметок:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S приложений:
 pane.item.attachments.count.singular=%S приложение:
 pane.item.attachments.count.plural=%S приложения(-й):
 pane.item.attachments.select=Выберите файл
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=нажмите здесь
-pane.item.tags=Теги:
 pane.item.tags.count.zero=%S тегов:
 pane.item.tags.count.singular=%S тег:
 pane.item.tags.count.plural=%S тега(-ов):
 pane.item.tags.icon.user=Тег, добавленный пользователем
 pane.item.tags.icon.automatic=Тег, добавленный автоматически
-pane.item.related=Связанные:
 pane.item.related.count.zero=%S связанных:
 pane.item.related.count.singular=%S связанный:
 pane.item.related.count.plural=%S связанных:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Вы не можете добавить ф
 ingester.saveToZotero=Сохранить в Zotero
 ingester.saveToZoteroUsing=Сохранить в Zotero, используя "%S"
 ingester.scraping=Сохранение документа…
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Документ сохранен
 ingester.scrapeError=Не получилось сохранить документ
 ingester.scrapeErrorDescription=Произошла ошибка при сохранении этого документа. Смотрите %S для дополнительной информации.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=Всегда разрешать для э
 
 ingester.importFile.title=Импорт файла
 ingester.importFile.text=Хотите импортировать файл "%S"?\n\nЭлементы будут добавлены к новой подборке.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Идёт поиск…
 ingester.lookup.error=Произошла ошибка при поиске данного элемента.
@@ -441,20 +483,33 @@ db.dbRestoreFailed=База данных '%S' Zotero была поврежден
 db.integrityCheck.passed=Ошибок в базе данных не найдено.
 db.integrityCheck.failed=Были найдены ошибки в базе данных Zotero!
 db.integrityCheck.dbRepairTool=Вы можете применить инструмент для ремонта базы данных с http://zotero.org/utils/dbfix , чтобы попробовать исправить эти ошибки.
-db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
-db.integrityCheck.appRestartNeeded=%S will need to be restarted.
-db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
-db.integrityCheck.errorsFixed=The errors in your Zotero database have been corrected.
-db.integrityCheck.errorsNotFixed=Zotero was unable to correct all the errors in your database.
-db.integrityCheck.reportInForums=You can report this problem in the Zotero Forums.
+db.integrityCheck.repairAttempt=Zotero может попробовать исправить эти ошибки.
+db.integrityCheck.appRestartNeeded=%S нужно перезапустить.
+db.integrityCheck.fixAndRestart=Исправить ошибки и перезапустить %S
+db.integrityCheck.errorsFixed=Ошибки в вашей базе Zotero исправлены.
+db.integrityCheck.errorsNotFixed=Zotero не удалось исправить все ошибки в вашей базе данных.
+db.integrityCheck.reportInForums=Вы можете об этой проблеме на форумах Zotero.
 
 zotero.preferences.update.updated=Обновлены
 zotero.preferences.update.upToDate=Актуальные
 zotero.preferences.update.error=Ошибка
-zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when possible
+zotero.preferences.launchNonNativeFiles=Открывать PDF и другие файлы в %S, если возможно
 zotero.preferences.openurl.resolversFound.zero=найдено %S серверов
 zotero.preferences.openurl.resolversFound.singular=найден %S сервер
 zotero.preferences.openurl.resolversFound.plural=найдено %S сервера(-ов)
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Перестроить индекс
 zotero.preferences.search.rebuildWarning=Вы хотите перестроить весь индекс? Это может занять некоторое время.\n\nЧтобы проиндексировать только непроиндексированные документы, используйте %S.
 zotero.preferences.search.clearIndex=Очистить индекс
@@ -481,7 +536,7 @@ zotero.preferences.search.pdf.tryAgainOrViewManualInstructions=Попробуй
 zotero.preferences.export.quickCopy.bibStyles=Библиографические стили
 zotero.preferences.export.quickCopy.exportFormats=Форматы экспорта
 zotero.preferences.export.quickCopy.instructions=Быстрое копирование позволяет вам копировать выбранные ссылки в буфер обмена, нажав горячую клавишу (%S), или перетаскивать документы в текстовое поле веб-страницы.
-zotero.preferences.export.quickCopy.citationInstructions=For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
+zotero.preferences.export.quickCopy.citationInstructions=Для стилей библиографии вы можете копировать цитаты или сноски, нажав %S или удерживая Shift при перетаскивании документов.
 zotero.preferences.styles.addStyle=Добавить стиль
 
 zotero.preferences.advanced.resetTranslatorsAndStyles=Обнулить трансляторы и стили
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Любые новые 
 zotero.preferences.advanced.resetStyles=Обнулить стили
 zotero.preferences.advanced.resetStyles.changesLost=Любые новые или измененные стили будут утеряны.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Следующие файлы уже существовали в директории назначения и не были скопированы:
 dragAndDrop.filesNotFound=Следующие файлы не были найдены и не были скопированы:
 
@@ -500,7 +559,8 @@ fileInterface.import=Импорт
 fileInterface.export=Экспорт
 fileInterface.exportedItems=Экспортированные документы
 fileInterface.imported=Импортированные
-fileInterface.fileFormatUnsupported=Не может быть найден транслятор для данного файла.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Неназванная библиография
 fileInterface.bibliographyHTMLTitle=Библиография
 fileInterface.importError=Произошла ошибка во время импортирования выбранного файла. Пожалуйста, убедитесь что файл правильный и попробуйте еще раз.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Документы, которые вы выбр
 fileInterface.bibliographyGenerationError=Произошла ошибка при создании вашей библиографии. Пожалуйста, попробуйте еще раз.
 fileInterface.exportError=Произошла ошибка при попытке экспортировать выбранный файл.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Расширенный режим поиска - нажмите Enter для поиска.
 searchInProgress=Поиск осуществляется — пожалуйста, подождите.
 
@@ -556,7 +620,7 @@ fulltext.indexState.partial=Частично
 
 exportOptions.exportNotes=Экспорт заметок
 exportOptions.exportFileData=Экспорт файлов
-exportOptions.useJournalAbbreviation=Use Journal Abbreviation
+exportOptions.useJournalAbbreviation=Использовать сокращенное название журнала
 charset.UTF8withoutBOM=Unicode (UTF-8 без BOM)
 charset.autoDetect=(автоопределение)
 
@@ -572,8 +636,8 @@ citation.multipleSources=Много источников…
 citation.singleSource=Один источник…
 citation.showEditor=Показать редактор…
 citation.hideEditor=Спрятать редактор…
-citation.citations=Citations
-citation.notes=Notes
+citation.citations=Цитаты
+citation.notes=Заметки
 
 report.title.default=Отчет Zotero
 report.parentItem=Родительский документ:
@@ -613,6 +677,7 @@ integration.cited.loading=Загружаются процитированные
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Пустая цитата
 integration.emptyCitationWarning.body=Выбранная цитата будет пуста при текущем стиле. Вы уверены, что хотите её добавить.
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Эта версия модуля Zotero для текстового процессора ($INTEGRATION_VERSION) несовместима с установленной версией самого Zotero — расширения для Firefox (%1$S). Пожалуйста, убедитесь, что вы используете последние версии обоих компонентов.
 integration.error.incompatibleVersion2=Для Zotero %1$S необходим %2$S %3$S или более поздний. Пожалуйста, загрузите последнюю версию %2$S с zotero.org.
@@ -643,14 +708,22 @@ integration.citationChanged=Вы изменили эту цитату с тог
 integration.citationChanged.description=Нажав "Да", вы включите блокировку изменений этой цитаты, если захотите добавить дополнительные цитаты, сменить стили или изменить ссылку. \nНажав "Нет", вы удалите свои изменения.
 integration.citationChanged.edit=Вы изменили эту цитату с того момента, как Zotero сгенерировал её. Редактирование удалит внесённые вами изменения. Хотите продолжить?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Установить стиль "%1$S" из %2$S?
 styles.updateStyle=Обновить существующий стиль "%1$S" стилем "%2$S" из %3$S?
 styles.installed=Стиль "%S" был успешно установлен.
 styles.installError=%S не является допустимым файлом стиля.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S ссылается на недопустимый или несуществующий файл CSL из %2$S в качестве своей основы.
 styles.deleteStyle=Вы уверены, что хотите удалить стиль "%1$S"?
 styles.deleteStyles=Вы уверены, что хотите удалить выбранные стили?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Отменить синхронизацию
 sync.openSyncPreferences=Открыть настройки синхронизации…
 sync.resetGroupAndSync=Обнулить группу и синхронизировать
@@ -660,8 +733,10 @@ sync.remoteObject=Удаленный объект
 sync.mergedObject=Объединенный объект
 
 sync.error.usernameNotSet=Имя пользователя не установлено
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Пароль не установлен
 sync.error.invalidLogin=Неверное имя пользователя или пароль
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Пожалуйста, введите пароль.
 sync.error.loginManagerCorrupted1=Zotero не может считать ваши регистрационные данные, вероятно, ввиду повреждения базы данных менеджера регистрационных данных Firefox.
 sync.error.loginManagerCorrupted2=Закройте Firefox, сделайте резервную копию и удалите signons.* из вашего профиля Firefox, затем заново введите ваши регистрационные данные в панели Синхронизация настроек Zotero.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Если вы продолжите, ваша коп
 sync.error.copyChangedItems=Если вы хотите скопировать ваши изменения в другое место или попросить доступ на запись у администратора группы, отмените синхронизацию сейчас.
 sync.error.manualInterventionRequired=Автоматическая синхронизация привела к конфликту, требующему ручного вмешательства.
 sync.error.clickSyncIcon=Нажмите на иконку синхронизации, чтобы синхронизировать вручную.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Ещё не синхронизировано
 sync.status.lastSync=Последняя синхронизация:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Загрузка данных на сервер син
 sync.status.uploadAccepted=Загрузка принята — ожидание сервера синхронизации
 sync.status.syncingFiles=Синхронизация файлов
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=осталось %SKB
 sync.storage.filesRemaining=%1$S/%2$S файлов
 sync.storage.none=Ничего
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Локальный Файл
 sync.storage.remoteFile=Удаленный Файл
 sync.storage.savedFile=Сохраненный Файл
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Конфигурация сервера
 sync.storage.fileSyncSetUp=Синхронизация файлов успешно установлена.
 sync.storage.openAccountSettings=Открыть настройки учетной записи
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Сервер %S недоступен.
 sync.storage.error.permissionDeniedAtAddress=У вас нет разрешения на создание каталога Zotero по следующему адресу:
 sync.storage.error.checkFileSyncSettings=Пожалуйста, проверьте ваши настройки синхронизации файлов или свяжитесь с администратором вашего сервера.
 sync.storage.error.verificationFailed=Проверка %S не удалась. Проверьте ваши настройки синхронизации файлов в панели Синхронизация настроек Zotero.
 sync.storage.error.fileNotCreated=Не получилось создать файл '%S' в папке хранения Zotero.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=У вас больше нет доступа на редактирование файлов в группе Zotero '%S', и файлы, которые вы добавили или изменили, не могут быть синхронизированы с сервером.
 sync.storage.error.copyChangedItems=Если вы хотите скопировать измененные документы и файлы в другое место, отмените синхронизацию сейчас.
 sync.storage.error.fileUploadFailed=Загрузка файла на сервер не удалась.
 sync.storage.error.directoryNotFound=Каталог не найден
 sync.storage.error.doesNotExist=%S не существует.
 sync.storage.error.createNow=Вы хотите создать его сейчас?
-sync.storage.error.webdav.enterURL=Пожалуйста, введите URL для WebDAV.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S не является допустимым URL для WebDAV.
 sync.storage.error.webdav.invalidLogin=Сервер WebDAV не принял имя пользователя и пароль, которые вы ввели.
 sync.storage.error.webdav.permissionDenied=У вас нет доступа к %S на сервере WebDAV.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=Ошибка соединения S
 sync.storage.error.webdav.loadURLForMoreInfo=Загрузите URL для WebDAV в браузере для дополнительной информации.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Подробности в справке об работе с сертификатами.
 sync.storage.error.webdav.loadURL=Загрузить WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Вы достигли своей квоты на хранение файлов на сервере Zotero. Некоторые файлы не были загружены на сервер. Остальные данные Zotero продолжат синхронизацию с сервером.
 sync.storage.error.zfs.personalQuotaReached2=Посмотрите настройки вашей учетной записи на zotero.org для дополнительных возможностей хранения.
 sync.storage.error.zfs.groupQuotaReached1=Группа '%S' достигла своей квоты на хранение файлов на сервере Zotero. Некоторые файлы не были загружены на сервер. Остальные данные Zotero продолжат синхронизацию с сервером.
 sync.storage.error.zfs.groupQuotaReached2=Владелец группы может увеличить доступное место для хранения в панели настроек Хранение на zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Сохранить тег
 sync.longTagFixer.saveTags=Сохранить теги
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Не получилось прочитать текс
 recognizePDF.noMatches=Не найдено соответствующих ссылок.
 recognizePDF.fileNotFound=Файл не найден.
 recognizePDF.limit=Достигнут предел количества запросов. Попробуйте ещё раз позже.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Извлечение метаданных завершено.
 recognizePDF.close.label=Закрыть
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Выберите, куда сохранить отформатированный файл
 rtfScan.scannedFileSuffix=(Отсканированно)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Поиск не удался
 lookup.failure.description=Zotero не смог найти запись для указанного идентификатора. Пожалуйста, проверьте идентификатор и попробуйте снова.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Смотреть онлайн
 locate.online.tooltip=Перейти к этому документу в сети
diff --git a/chrome/locale/sk-SK/zotero/about.dtd b/chrome/locale/sk-SK/zotero/about.dtd
index a33f45d3db..d2a16a4b7a 100644
--- a/chrome/locale/sk-SK/zotero/about.dtd
+++ b/chrome/locale/sk-SK/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Špeciálne poďakovanie:">
 <!ENTITY zotero.about.close "Zatvoriť">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Viac uznaní &amp; poďakovaní">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/sk-SK/zotero/preferences.dtd b/chrome/locale/sk-SK/zotero/preferences.dtd
index f0c52d8a8b..b1b1b64dc1 100644
--- a/chrome/locale/sk-SK/zotero/preferences.dtd
+++ b/chrome/locale/sk-SK/zotero/preferences.dtd
@@ -1,8 +1,9 @@
-<!ENTITY zotero.preferences.title "Zotero - Predvoľby">
+<!ENTITY zotero.preferences.title "Predvoľby Zotero">
 
 <!ENTITY zotero.preferences.default "Predvolené:">
 <!ENTITY zotero.preferences.items "položiek">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Všeobecné">
 
@@ -38,7 +39,7 @@
 <!ENTITY zotero.preferences.groups.childNotes "vložené poznámky">
 <!ENTITY zotero.preferences.groups.childFiles "vložené snímky a importované súbory">
 <!ENTITY zotero.preferences.groups.childLinks "vložené odkazy">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "značky">
 
 <!ENTITY zotero.preferences.openurl.caption "OpenURL">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Na synchronizáciu príloh v Mojej knižnici použiť">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Prílohy v skupinových knižniciach synchronizovať prostredníctvom Úložiska Zotero">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Používaním Úložiska Zotero súhlasíte s uvedenými">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "pravidlami a podmienkami">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Úplná synchronizácia so serverom Zotero">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Zlúčiť lokálne dáta s dátami na serveri bez ohľadu predchádzajúce synchronizácie.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Obnoviť dáta zo servera Zotero">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Vymazať všetky dáta na serveri a nahradiť ich lokálnymi.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Vymazať históriu synchronizácie súborov">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Nechať server znovu preveriť, či obsahuje všetky lokálne prílohy.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Obnoviť...">
 
 
@@ -114,13 +121,14 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Názov">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Aktualizované">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Získať ďalšie štýly...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Klávesové skratky">
 
 <!ENTITY zotero.preferences.keys.openZotero "Otvoriť/zatvoriť Zotero">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Prepnúť Zotero do celého okna">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "Tabla knižníc Focus">
 <!ENTITY zotero.preferences.keys.quicksearch "Rýchle vyhľadávanie">
 <!ENTITY zotero.preferences.keys.newItem "Vytvoriť novú položku">
 <!ENTITY zotero.preferences.keys.newNote "Vytvoriť novú poznámku">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - ľubovoľný reťazec">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Pokročilé">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Lokalizovať">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Správca motora vyhľadávania článkov">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Prehľadávať...">
 <!ENTITY zotero.preferences.dataDir.reveal "Zobraziť priečinok s dátami">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Údržba databázy">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Skontrolovať integritu databázy">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Obnoviť konvertory a citačné štýly...">
diff --git a/chrome/locale/sk-SK/zotero/standalone.dtd b/chrome/locale/sk-SK/zotero/standalone.dtd
index f2161c93a4..e03bab08b4 100644
--- a/chrome/locale/sk-SK/zotero/standalone.dtd
+++ b/chrome/locale/sk-SK/zotero/standalone.dtd
@@ -12,12 +12,12 @@
 
 <!ENTITY fileMenu.label "Súbor">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "Uložiť...">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
+<!ENTITY pageSetupCmd.label "Nastavenie strany...">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "Tlačiť...">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "U">
 <!ENTITY closeCmd.label "Zatvoriť">
diff --git a/chrome/locale/sk-SK/zotero/zotero.dtd b/chrome/locale/sk-SK/zotero/zotero.dtd
index ee595b191b..c927ff95f5 100644
--- a/chrome/locale/sk-SK/zotero/zotero.dtd
+++ b/chrome/locale/sk-SK/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Upraviť">
 <!ENTITY zotero.general.delete "Vymazať">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Hlásenie o chybe môže obsahovať informácie nesúvisiace so Zoterom.">
 <!ENTITY zotero.errorReport.submissionInProgress "Prosím počkajte, kým sa hlásenie o chybe neodošle.">
 <!ENTITY zotero.errorReport.submitted "Hlásenie o chybe bolo odoslané.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Prosím napíšte správu do diskusného fóra Zotero (forums.zotero.org) obsahujúcu toto ID, popis problému a kroky, ktoré sú potrebné k jeho reprodukovaniu.">
 <!ENTITY zotero.errorReport.notReviewed "Hlásenia o chybách nie sú preskúmané, pokiaľ sa na ne neodkazuje v diskusných fórach.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Nainštalovali ste novú verziu Zotera.">
 <!ENTITY zotero.upgrade.upgradeRequired "Na to, aby ste mohli pracovať s novou verziou je potrebné aktualizovať vašu Zotero databázu.">
 <!ENTITY zotero.upgrade.autoBackup "Pred tým, než budú vykonané zmeny, sa vaša súčasná databáza automaticky zálohuje.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Práva">
 <!ENTITY zotero.items.dateAdded_column "Pridané dňa">
 <!ENTITY zotero.items.dateModified_column "Upravené dňa">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Zobraziť v knižnici">
 <!ENTITY zotero.items.menu.attach.note "Pridať poznámku">
@@ -68,10 +86,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Vrátiť do knižnice">
 <!ENTITY zotero.items.menu.duplicateItem "Duplikovať vybraný exemplár">
-<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+<!ENTITY zotero.items.menu.mergeItems "Zlúčiť položky...">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
-<!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "Zvoľte verziu položky, ktorú chcete použiť ako hlavnú položku:">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "Vyberte polia, ktoré chcete zachovať z ostatných verzií položky:">
 
 <!ENTITY zotero.toolbar.newItem.label "Nový exemplár">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Viac">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Preveď text">
 <!ENTITY zotero.item.textTransform.titlecase "Prvé Veľké">
 <!ENTITY zotero.item.textTransform.sentencecase "Prvé veľké písmeno vo vete">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nová poznámka">
 <!ENTITY zotero.toolbar.note.standalone "Nová samostatná poznámka">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Označiť viditeľné">
 <!ENTITY zotero.tagSelector.clearVisible "Odznačiť viditeľné">
 <!ENTITY zotero.tagSelector.clearAll "Odznačiť všetky">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Premenovať značku...">
 <!ENTITY zotero.tagSelector.deleteTag "Vymazať značku...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Zadajte do poľa ISBN, DOI alebo PMID podľa ktorého chcete vyhľadávať.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Označiť exempláre">
 <!ENTITY zotero.selectitems.intro.label "Označte, ktoré exempláre chcete pridať do vašej knižnice">
@@ -132,9 +159,9 @@
 
 <!ENTITY zotero.bibliography.title "Vytvoriť bibliografiu">
 <!ENTITY zotero.bibliography.style.label "Citačný štýl:">
-<!ENTITY zotero.bibliography.outputMode "Output Mode:">
-<!ENTITY zotero.bibliography.bibliography "Bibliography">
-<!ENTITY zotero.bibliography.outputMethod "Output Method:">
+<!ENTITY zotero.bibliography.outputMode "Výstupný režim:">
+<!ENTITY zotero.bibliography.bibliography "Bibliografia">
+<!ENTITY zotero.bibliography.outputMethod "Výstupná metóda:">
 <!ENTITY zotero.bibliography.saveAsRTF.label "Uložiť ako RTF">
 <!ENTITY zotero.bibliography.saveAsHTML.label "Uložiť ako HTML">
 <!ENTITY zotero.bibliography.copyToClipboard.label "Skopírovať do schránky">
@@ -143,7 +170,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Vlastnosti dokumentu">
 <!ENTITY zotero.integration.addEditCitation.title "Pridať/Upraviť citáciu">
 <!ENTITY zotero.integration.editBibliography.title "Upraviť bibliografiu">
-<!ENTITY zotero.integration.quickFormatDialog.title "Quick Format Citation">
+<!ENTITY zotero.integration.quickFormatDialog.title "Rýchle formátovanie citácie">
 
 <!ENTITY zotero.progress.title "Postup">
 
@@ -162,7 +189,7 @@
 <!ENTITY zotero.citation.suppressAuthor.label "Vynechaj autora">
 <!ENTITY zotero.citation.prefix.label "Predpona:">
 <!ENTITY zotero.citation.suffix.label "Prípona:">
-<!ENTITY zotero.citation.editorWarning.label "Warning: If you edit a citation in the editor it will no longer update to reflect changes in your database or the citation style.">
+<!ENTITY zotero.citation.editorWarning.label "Pozor: Ak upravujete citáciu v editore, nebude sa viac aktualizovať a zohľadňovať zmeny vo vašej databáze alebo v citačnom štýle.">
 
 <!ENTITY zotero.richText.italic.label "Kurzíva">
 <!ENTITY zotero.richText.bold.label "Tučné">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Nevybrané značky nebudú uložené.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Značka bude odstránená zo všetkých položiek.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Rozpoznané proxy">
 <!ENTITY zotero.proxy.recognized.warning "Pridávajte iba proxy prepojené s vašou knižnicou, školou alebo s vašim podnikovým webovým sídlom">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Pridávanie iných proxy môže umožniť škodlivým stránkam vydávať sa za dôveryhodné.">
diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties
index 63997cb919..cbe4c97163 100644
--- a/chrome/locale/sk-SK/zotero/zotero.properties
+++ b/chrome/locale/sk-SK/zotero/zotero.properties
@@ -1,4 +1,4 @@
-extensions.zotero@chnm.gmu.edu.description=Nástroj pre výskum novej generácie
+extensions.zotero@chnm.gmu.edu.description=Výskumný nástroj novej generácie
 
 general.success=Podarilo sa
 general.error=Chyba
@@ -11,9 +11,12 @@ general.restartRequiredForChange=Aby sa zmena prejavili, je potrebné reštartov
 general.restartRequiredForChanges=Aby sa zmeny prejavili, je potrebné reštartovať %S.
 general.restartNow=Reštartovať teraz
 general.restartLater=Reštartovať neskôr
-general.restartApp=Restart %S
+general.restartApp=Reštartovať %S
 general.errorHasOccurred=Vyskytla sa chyba.
 general.unknownErrorOccurred=Vyskytla sa neznáma chyba.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Prosím, reštartujte Firefox.
 general.restartFirefoxAndTryAgain=Prosím, reštartujte Firefox a skúste to znova.
 general.checkForUpdate=Hľadať aktualizácie
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Pre viac informácií pozri %S.
 general.enable=Povoliť
 general.disable=Zakázať
 general.remove=Odstrániť
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Otvoriť dokumentáciu
-general.numMore=%S more…
+general.numMore=%S viac…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Zotero práve vykonáva operáciu.
 general.operationInProgress.waitUntilFinished=Prosím počkajte, kým sa neukončí.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Pre nahlásenie chyby vývojárom stlačte %S.
 errorReport.stepsToReproduce=Kroky, ktoré viedli ku chybe:
 errorReport.expectedResult=Očakávaný výsledok:
 errorReport.actualResult=Skutočný výsledok:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Zotero nemôže nájsť priečinok s dátami.
 dataDir.previousDir=Predchádzajúci priečinok:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Použi priečinok s profilom Firefoxu
 dataDir.selectDir=Vyberte si priečinok, do ktorého má Zotero ukladať dáta
 dataDir.selectedDirNonEmpty.title=Priečinok nie je prázdny
 dataDir.selectedDirNonEmpty.text=Zvolený priečinok nie je prázdny a nevyzerá, že by obsahoval dáta zo Zotera.\n\nChcete napriek tomu, aby sa súbory vytvorili v tomto priečinku?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Našla sa jestvujúca knižnica Zotero
 dataDir.standaloneMigration.description=Zdá sa, že toto je prvý krát, čo používate %1$S. Chcete, aby %1$S naimportoval nastavenia %2$S a použil váš existujúci dátový adresár?
 dataDir.standaloneMigration.multipleProfiles=%1$S bude zdieľať svoj dátový adresár s naposledy používaným profilom.
@@ -114,10 +141,11 @@ pane.collections.newSavedSeach=Nové uložené vyhľadávanie
 pane.collections.savedSearchName=Vložte názov pre toto uložené vyhľadávanie:
 pane.collections.rename=Premenovať kolekciu:
 pane.collections.library=Moja knižnica
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Kôš
 pane.collections.untitled=Bez názvu
 pane.collections.unfiled=Nezaradené položky
-pane.collections.duplicate=Duplicate Items
+pane.collections.duplicate=Duplicitné položky
 
 pane.collections.menu.rename.collection=Premenovať kolekciu...
 pane.collections.menu.edit.savedSearch=Upraviť uložené vyhľadávanie
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Naozaj chcete vymazať túto značku?\n\nZnačka
 pane.tagSelector.numSelected.none=Nie je vybraná žiadna značka
 pane.tagSelector.numSelected.singular=%S vybraná značka
 pane.tagSelector.numSelected.plural=%S vybraných značiek
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Nahrávam zoznam položiek...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Presunúť do koša
 pane.items.trash=Ste si istý, že chcete vybranú položku presunúť do koša?
 pane.items.trash.multiple=Ste si istý, že chcete vybrané položky presunúť do koša?
@@ -176,10 +210,15 @@ pane.items.interview.manyParticipants=Rozhovor - %S et al.
 
 pane.item.selected.zero=Nie sú vybrané žiadne položky
 pane.item.selected.multiple=%S vybraných položiek
-pane.item.unselected.zero=No items in this view
-pane.item.unselected.singular=%S item in this view
-pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+pane.item.unselected.zero=V tomto náhľade nie sú žiadne položky
+pane.item.unselected.singular=%S položiek v tomto náhľade
+pane.item.unselected.plural=%S položiek v tomto náhľade
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Zmeniť typ položky
 pane.item.changeType.text=Naozaj chcete zmeniť typ položky?\n\nNasledujúce polia sa stratia:
@@ -188,8 +227,8 @@ pane.item.defaultLastName=priezvisko
 pane.item.defaultFullName=celé meno
 pane.item.switchFieldMode.one=Spoločné pole pre meno
 pane.item.switchFieldMode.two=Samostatné polia pre meno
-pane.item.creator.moveUp=Move Up
-pane.item.creator.moveDown=Move Down
+pane.item.creator.moveUp=Presunúť nahor
+pane.item.creator.moveDown=Presunúť nadol
 pane.item.notes.untitled=Nepomenovaná poznámka
 pane.item.notes.delete.confirm=Naozaj chcete vymazať túto poznámku?
 pane.item.notes.count.zero=Žiadne poznámky:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=Žiadne prílohy:
 pane.item.attachments.count.singular=%S príloha:
 pane.item.attachments.count.plural=%S príloh:
 pane.item.attachments.select=Vyberte súbor
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=kliknite sem
-pane.item.tags=Značky:
 pane.item.tags.count.zero=Žiadne značky:
 pane.item.tags.count.singular=%S značka:
 pane.item.tags.count.plural=%S značiek:
 pane.item.tags.icon.user=Značka priradená používateľom
 pane.item.tags.icon.automatic=Automaticky priradená značka
-pane.item.related=Súvisiace:
 pane.item.related.count.zero=Žiadne súvisiace položky:
 pane.item.related.count.singular=%S súvisiaca položka:
 pane.item.related.count.plural=%S súvisiacich položiek:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Nemôžete pridať súbory do práve vybra
 ingester.saveToZotero=Uložiť do Zotera
 ingester.saveToZoteroUsing=Uložiť do Zotera cez "%S"
 ingester.scraping=Ukladám položku...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Položka bola uložená
 ingester.scrapeError=Nemôžem uložiť položku
 ingester.scrapeErrorDescription=Pri ukladaní položky sa vyskytla chyba. Pre viac informácií si pozrite %S.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=Vždy povoliť pre túto stránku
 
 ingester.importFile.title=Importovať súbor
 ingester.importFile.text=Chcete naimportovať súbor "%S"?\n\nsúborov sa načíta do kolekcie.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Prebieha hľadanie…
 ingester.lookup.error=Pri hľadaní tejto položky sa vyskytla chyba.
@@ -441,20 +483,33 @@ db.dbRestoreFailed=Zdá sa, že došlo k porušeniu Zotero databázy '%S' a poku
 db.integrityCheck.passed=Databáza je v poriadku.
 db.integrityCheck.failed=V databáze boli nájdené chyby!
 db.integrityCheck.dbRepairTool=Na ich odstránenie môžete použiť nástroj pre opravu databázy, ktorý nájdete na http://zotero.org/utils/dbfix.
-db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
-db.integrityCheck.appRestartNeeded=%S will need to be restarted.
-db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
-db.integrityCheck.errorsFixed=The errors in your Zotero database have been corrected.
-db.integrityCheck.errorsNotFixed=Zotero was unable to correct all the errors in your database.
-db.integrityCheck.reportInForums=You can report this problem in the Zotero Forums.
+db.integrityCheck.repairAttempt=Zotero sa môže pokúsiť opraviť tieto chyby.
+db.integrityCheck.appRestartNeeded=%S sa musí reštartovať.
+db.integrityCheck.fixAndRestart=Opraviť chyby a reštartovať %S
+db.integrityCheck.errorsFixed=Chyby vo vašej databáze Zotero boli opravené.
+db.integrityCheck.errorsNotFixed=Zotero nebol schopný opraviť všetky chyby vo vašej databáze.
+db.integrityCheck.reportInForums=Tento problém môžete nahlásiť do Fóra Zotero.
 
 zotero.preferences.update.updated=Aktualizované
 zotero.preferences.update.upToDate=Aktuálne
 zotero.preferences.update.error=Chyba
-zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when possible
+zotero.preferences.launchNonNativeFiles=Otvorte súbory PDF a ďalšie v rámci %S ak je to možné
 zotero.preferences.openurl.resolversFound.zero=Nebol nájdený žiadny resolver
 zotero.preferences.openurl.resolversFound.singular=Našiel sa %S resolver
 zotero.preferences.openurl.resolversFound.plural=Nájdených %S resolverov
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Znovu vytvoriť index
 zotero.preferences.search.rebuildWarning=Naozaj chcete znovu vytvoriť celý index? Môže to chvíľu trvať.\n\nAk chcete indexovať len položky, ktoré neboli indexované, použite %S.
 zotero.preferences.search.clearIndex=Vymazať index
@@ -481,7 +536,7 @@ zotero.preferences.search.pdf.tryAgainOrViewManualInstructions=Prosím, skúste
 zotero.preferences.export.quickCopy.bibStyles=Bibliografické štýly
 zotero.preferences.export.quickCopy.exportFormats=Formáty pre export
 zotero.preferences.export.quickCopy.instructions=Rýchle kopírovanie vám umožňuje kopírovať referencie do schránky stlačením klávesovej skratky (%S) alebo presunutím položiek pomocou myši do textového poľa na webovej schránke.
-zotero.preferences.export.quickCopy.citationInstructions=For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
+zotero.preferences.export.quickCopy.citationInstructions=Pre bibliografické štýly, citácie alebo poznámky pod čiarou môžete skopírovať stlačením %S alebo podržaním klávesy Shift pred potiahnutím položky.
 zotero.preferences.styles.addStyle=Pridať štýl
 
 zotero.preferences.advanced.resetTranslatorsAndStyles=Obnoviť konvertory a štýly
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Všetky nové alebo mod
 zotero.preferences.advanced.resetStyles=Obnoviť štýly
 zotero.preferences.advanced.resetStyles.changesLost=Všetky nové alebo modifikované štýly budú odstránené.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Nasledujúce súbory už v cieľovom priečinku existovali a neboli skopírované:
 dragAndDrop.filesNotFound=Nasledujúce súbory sa nenašli a neboli skopírované:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importovať
 fileInterface.export=Exportovať
 fileInterface.exportedItems=Exportované položky
 fileInterface.imported=Importované
-fileInterface.fileFormatUnsupported=Pre daný súbor nemôžem nájsť žiaden konvertor.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Nepomenovaná bibliografia
 fileInterface.bibliographyHTMLTitle=Bibliografia
 fileInterface.importError=Pri importovaní zvoleného súboru sa vyskytla chyba. Prosím, skontrolujte či je súbor v poriadku a skúste to znova.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Označené položky neobsahujú žiadne referenc
 fileInterface.bibliographyGenerationError=Pri vytváraní bibliografie sa vyskytla chyba. Skúste to znovu.
 fileInterface.exportError=Pri exportovaní vybraného súboru sa vyskytla chyba.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Pokročilé vyhľadávanie — pre hľadanie stlačte Enter
 searchInProgress=Vyhľadávam — čakajte, prosím.
 
@@ -556,7 +620,7 @@ fulltext.indexState.partial=Čiastočne indexované
 
 exportOptions.exportNotes=Exportuj poznámky
 exportOptions.exportFileData=Exportuj súbory
-exportOptions.useJournalAbbreviation=Use Journal Abbreviation
+exportOptions.useJournalAbbreviation=Použiť skratku časopisu
 charset.UTF8withoutBOM=Unicode (UTF-8 bez BOM)
 charset.autoDetect=(autodetekcia)
 
@@ -572,8 +636,8 @@ citation.multipleSources=Viaceré zdroje...
 citation.singleSource=Jeden zdroj...
 citation.showEditor=Zobraziť editor...
 citation.hideEditor=Skryť editor...
-citation.citations=Citations
-citation.notes=Notes
+citation.citations=Citácie
+citation.notes=Poznámky
 
 report.title.default=Hlásenie Zotera
 report.parentItem=Nadradená položka:
@@ -613,6 +677,7 @@ integration.cited.loading=Načítavajú sa citované položky
 integration.ibid=tamže
 integration.emptyCitationWarning.title=Prázdna citácia
 integration.emptyCitationWarning.body=Vybraná citácia zostane v aktuálne zvolenom štýle prázdna. Naozaj ju chcete vložiť?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Táto verzia doplnku Zotero pre textový editor Word ($INTEGRATION_VERSION) nie je kompatibilná s akutálne nainštalovanou verziou rozšírenia Zotero pre Firefox (%1$S). Prosím ubezpečte sa, že používate najaktuálnejšie verzie z oboch komponentov.
 integration.error.incompatibleVersion2=Zotero %1$S vyžaduje %2$S %3$S alebo novší. Stiahnite si prosím najnovšiu verziu %2$S zo stránky www.zotero.org.
@@ -643,14 +708,22 @@ integration.citationChanged=Upravili ste túto citáciu potom ako ju Zotero vyge
 integration.citationChanged.description=Kliknutím na "Áno" sa Zoteru znemožní aktualizácia tejto citácie, ak pridáte ďalšie citácie, prepnete štýly alebo upravíte odkazy na ne. Kliknutím na "Nie" sa vaše zmeny stratia.
 integration.citationChanged.edit=Túto citáciu ste zmenili potom ako ju Zotero vygeneroval. Upravovaním sa vaše zmeny stratia. Chcete pokračovať?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Nainštalovať štýl "%1$S" z %2$S?
 styles.updateStyle=Aktualizovať existujúci štýl "%1$S" s "%2$S" z %3$S?
 styles.installed=Štýl "%S" bol úspešne nainštalovaný.
 styles.installError=%S nie je platným súborom pre štýl.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S na neplatný alebo neexistujúci CSL súbor na %2$S ako svoj zdroj.
 styles.deleteStyle=Ste si istý, že chcete odstrániť štýl "%1$S"?
 styles.deleteStyles=Ste si istý, že chcete odstrániť vybrané štýly?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Zrušiť synchronizáciu
 sync.openSyncPreferences=Otvoriť predvoľby pre synchronizáciu...
 sync.resetGroupAndSync=Obnoviť skupinu a synchronizovať
@@ -660,8 +733,10 @@ sync.remoteObject=Vzdialený objekt
 sync.mergedObject=Zlúčený objekt
 
 sync.error.usernameNotSet=Nie je nastavené meno používateľa
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Heslo nie je nastavené
 sync.error.invalidLogin=Nesprávne meno alebo heslo
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Prosím zdajte heslo.
 sync.error.loginManagerCorrupted1=Zotero nemá prístup k vašim prihlasovacím údajom, pravdepodobne kvôli poškodeniu databázy Firefoxu pre správu hesiel.
 sync.error.loginManagerCorrupted2=Zatvorte Firefox, zálohujte a potom vymažte súbory signons.* z priečinka s vašim Firefox profilom. Potom zadajte vaše prihlasovacie údaje k Zotero serveru v záložke Synch v predvoľbách Zotero.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Ak budete pokračovať v synchronizácii, vaša kóp
 sync.error.copyChangedItems=Ak chcete skopírovať vaše úpravy na iné miesto alebo si vyžiadať od administrátora skupiny práva na zápis, zrušte aktuálnu synchronizáciu.
 sync.error.manualInterventionRequired=Automatická synchronizácia narazila na konflikt, ktorý si vyžaduje manuálny zásah.
 sync.error.clickSyncIcon=Kliknite na ikonu sychronizácie pre manuálnu synchronizáciu.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Zatiaľ nesynchronizované
 sync.status.lastSync=Posledná synchronizácia:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Nahrávanie dát na synchronizačný server
 sync.status.uploadAccepted=Dáta pre nahratie akceptované - čaká sa na synchronizačný server.
 sync.status.syncingFiles=Synchronizácia súborov
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB zostáva
 sync.storage.filesRemaining=%1$S/%2$S súborov
 sync.storage.none=Žiadny
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Miestny súbor
 sync.storage.remoteFile=Vzdialený súbor
 sync.storage.savedFile=Uložený súbor
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Konfigurácia servera bola overená
 sync.storage.fileSyncSetUp=Synchronizácia súborov bola úspešne nastavená.
 sync.storage.openAccountSettings=Otvoriť nastavenia účtu
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=K serveru %S sa nedá pripojiť.
 sync.storage.error.permissionDeniedAtAddress=Nemáte povolenie vytvoriť priečinok Zotero na nasledujúcej adrese:
 sync.storage.error.checkFileSyncSettings=Prosím skontrolujte si vaše nastavenia pre synchronizáciu súborov alebo kontaktujte správcu servera.
 sync.storage.error.verificationFailed=%S overenie zlyhalo.
 sync.storage.error.fileNotCreated=Súbor '%S' sa nedal vytvoriť v 'úložnom' adresári Zotera.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=V skupine "%S"už nemáte právo upravovať súbory a tak súbory, ktoré ste pridali alebo upravili, nemôžu byť synchronizované na server.
 sync.storage.error.copyChangedItems=Ak chcete upravené položky skopírovať na iné miesto, zrušte aktuálnu synchronizáciu.
 sync.storage.error.fileUploadFailed=Nahrávanie súboru na server zlyhalo.
 sync.storage.error.directoryNotFound=Priečinok nebol nájdený
 sync.storage.error.doesNotExist=%S neexistuje.
 sync.storage.error.createNow=Chcete ho vytvoriť?
-sync.storage.error.webdav.enterURL=Prosím zadajte URL WebDAV.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S nie je platná URL WebDAV.
 sync.storage.error.webdav.invalidLogin=Server WebDAV neakceptoval poskytnuté meno používateľa a heslo.
 sync.storage.error.webdav.permissionDenied=Nemáte povolenie na prístup k %S na serveri WebDAV.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=Chyba zabezpečeného SSL pripojeni
 sync.storage.error.webdav.loadURLForMoreInfo=Pre viac informácií otvorte URL WebDAV servera vo vašom internetovom prehliadači.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Pozrite sa do dokumentácie o obídení certifikátu pre viac informácií.
 sync.storage.error.webdav.loadURL=Načítať WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Prekročili ste vašu kvótu na Úložisku Zotero a preto niektoré zo súborov neboli nahraté. Ostatné dáta (okrem súborov) budú so serverom aj naďalej synchronizované.
 sync.storage.error.zfs.personalQuotaReached2=Pozrite si nastavenia vášho účtu na zotero.org pre možnosti, ako je možné získať viac priestoru pre vaše dáta.
 sync.storage.error.zfs.groupQuotaReached1=Skupina "%S" prekročila svoju kvótu na Úložisku Zotero a preto niektoré zo súborov neboli nahraté. Ostatné dáta (okrem súborov) budú so serverom aj naďalej synchronizované.
 sync.storage.error.zfs.groupQuotaReached2=Majiteľ skupiny môže zvýšiť jej kapacitu pre ukladanie súborov v časti nastavenie ukladacieho priestoru (storage settings) na zotero.org
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Uložiť značku
 sync.longTagFixer.saveTags=Uložiť značky
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Nedokážem prečítať text z PDF.
 recognizePDF.noMatches=Žiadne zodpovedajúce referencie neboli nájdené.
 recognizePDF.fileNotFound=Súbor nebol nájdený.
 recognizePDF.limit=Kvôta bola dosiahnutá. Skúste neskôr.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Vyhľadávanie metadát je dokončené.
 recognizePDF.close.label=Zatvoriť
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Vyberte umiestnenie, kam sa má uložiť preformátovaný súbor
 rtfScan.scannedFileSuffix=(spracovaný)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Vyhľadávanie zlyhalo
 lookup.failure.description=Zotero nemohol nájsť záznam pre špecifikovaný identifikátor. Prosím skontrolujte identifikátor a skúste to znova.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Zobraziť online
 locate.online.tooltip=Prejsť na túto položku na internete
diff --git a/chrome/locale/sl-SI/zotero/about.dtd b/chrome/locale/sl-SI/zotero/about.dtd
index 295fd3e3bb..16714c6c81 100644
--- a/chrome/locale/sl-SI/zotero/about.dtd
+++ b/chrome/locale/sl-SI/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Posebna zahvala:">
 <!ENTITY zotero.about.close "Zapri">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Več zahval in zaslužnih">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/sl-SI/zotero/preferences.dtd b/chrome/locale/sl-SI/zotero/preferences.dtd
index 46c73bcc6e..24f1ddc5e0 100644
--- a/chrome/locale/sl-SI/zotero/preferences.dtd
+++ b/chrome/locale/sl-SI/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Privzeto:">
 <!ENTITY zotero.preferences.items "vnosov">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Splošno">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Uskladi datoteke priponk v Moji knjižnici s/z">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Uskladi datoteke priponk v skupinskih knjižnicah s shrambo Zotero">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "O usklajevanju datotek">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Če uporabljate shrambo Zotero, se strinjate z njenimi">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "pravili, omejitvami in pogoji">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Polna uskladitev s strežnikom Zotero">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Spoji krajevne podatke Zotero s podatki s strežnika Zotero, pri čemer prezri zgodovino usklajevanja.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Obnovi s strežnika Zotero">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Pobriši vse strežniške podatke in prepiši s krajevnimi podatki Zotero.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Ponastavi zgodovino usklajevanja datotek">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Vsili preverjanje strežnika hrambe za vse krajevne datoteke priponk.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Ponastavi ...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Naslov">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Posodobljeno">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Dobi dodatne sloge ...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Tipke za bližnjice">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Poljuben niz">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Napredno">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Lociraj">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Upravitelj pogona iskanja člankov">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Izberi ...">
 <!ENTITY zotero.preferences.dataDir.reveal "Pokaži mapo s podatki">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Vzdrževanje zbirke podatkov">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Preveri integriteto zbirke podatkov">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Ponastavi prevajalnike in sloge ...">
diff --git a/chrome/locale/sl-SI/zotero/zotero.dtd b/chrome/locale/sl-SI/zotero/zotero.dtd
index b1eed8835d..9f11c48e5e 100644
--- a/chrome/locale/sl-SI/zotero/zotero.dtd
+++ b/chrome/locale/sl-SI/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Uredi">
 <!ENTITY zotero.general.delete "Izbriši">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Zapisnik napak lahko vključuje sporočila, ki se ne nanašajo na Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Počakajte, da je poročilo o napaki oddano.">
 <!ENTITY zotero.errorReport.submitted "Poročilo o napaki je bilo oddano.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Opišite težavo z ID-jem tega poročila na forumih Zotero (forums.zotero.org), skupaj s potrebnimi koraki za priklic takšne napake.">
 <!ENTITY zotero.errorReport.notReviewed "Poročila o napaki ponavadi niso vsa pregledana, razen če o njih poročate na forumu.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Namestili ste novejšo različico razširitve Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Vašo zbirko podatkov Zotero je potrebno nadgraditi, da bo delovala z novejšo različico.">
 <!ENTITY zotero.upgrade.autoBackup "Vaša obstoječa zbirka podatkov bo samodejno varnostno kopirana, preden se opravijo spremembe.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Pravice">
 <!ENTITY zotero.items.dateAdded_column "Dodano dne">
 <!ENTITY zotero.items.dateModified_column "Datum spremembe">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Pokaži v knjižnici">
 <!ENTITY zotero.items.menu.attach.note "Dodaj opombo">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Preoblikuj besedilo">
 <!ENTITY zotero.item.textTransform.titlecase "Velike Začetnice">
 <!ENTITY zotero.item.textTransform.sentencecase "Kot v stavku">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Nova opomba">
 <!ENTITY zotero.toolbar.note.standalone "Nova samostojna opomba">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Izberi vidno">
 <!ENTITY zotero.tagSelector.clearVisible "Ne izberi vidno">
 <!ENTITY zotero.tagSelector.clearAll "Ne izberi ničesar">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Preimenuj značko ...">
 <!ENTITY zotero.tagSelector.deleteTag "Izbriši značko ...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "V spodnje polje vnesite ISBN, DOI ali PMID, potrebno za iskanje.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Izberi vnose">
 <!ENTITY zotero.selectitems.intro.label "Izberite vnose, ki bi jih želeli dodati v svojo knjižnico">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Nepotrjene značke ne bodo shranjene.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Značka bo izbrisana z vseh vnosov.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Posredovalni strežnik prepoznan">
 <!ENTITY zotero.proxy.recognized.warning "Dodajte le posredovalne strežnike, povezane z vašo knjižnico, šolo ali korporativnim spletnim mestom">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Dodajanje drugih posredovalnih strežnikov omogoča, da se škodoželjna spletna mesta pretvarjajo kot zaupanja vredna spletna mesta.">
diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties
index 4a57c48d4c..8589656e56 100644
--- a/chrome/locale/sl-SI/zotero/zotero.properties
+++ b/chrome/locale/sl-SI/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Ponovno zaženi kasneje
 general.restartApp=Ponovno zaženi %S
 general.errorHasOccurred=Prišlo je do napake.
 general.unknownErrorOccurred=Prišlo je do neznane napake.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Ponovno zaženite %S.
 general.restartFirefoxAndTryAgain=Ponovno zaženite %S in poskusite znova.
 general.checkForUpdate=Preveri stanje posodobitev
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Oglejte si %S za več informacij.
 general.enable=Omogoči
 general.disable=Onemogoči
 general.remove=Odstrani
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Odpri dokumentacijo
 general.numMore=Še %S ...
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Trenutno je v teku opravilo Zotero.
 general.operationInProgress.waitUntilFinished=Počakajte, da se dokonča.
@@ -57,7 +64,7 @@ upgrade.advanceMessage=Pritisnite %S za takojšnjo posodobitev.
 upgrade.dbUpdateRequired=Zbirko podatkov Zotero je potrebno posodobiti.
 upgrade.integrityCheckFailed=Preden se lahko posodobitev nadaljuje, je potrebno vašo zbirko podatkov Zotero popraviti.
 upgrade.loadDBRepairTool=Naloži orodje popravila zbrike podatkov
-upgrade.couldNotMigrate=Zotero ni uspel migrirati vseh potrebnih datotek.\nZaprite vse odprte datoteke priponk in ponovno zaženite Firefox, da znova poskusite s posodobitvijo.
+upgrade.couldNotMigrate=Zotero ni uspel migrirati vseh potrebnih datotek.\nZaprite vse odprte datoteke priponk in ponovno zaženite %S, da znova poskusite s posodobitvijo.
 upgrade.couldNotMigrate.restart=Če še naprej prejemate to sporočilo, ponovon zaženite računalnik.
 
 errorReport.reportError=Poročaj o napaki ...
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Pritisnite %S, če želite poslati poročilo o napaki
 errorReport.stepsToReproduce=Koraki do napake:
 errorReport.expectedResult=Pričakovan rezultat:
 errorReport.actualResult=Dejanski rezultat:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Podatkovne mape Zotero ni mogoče najti.
 dataDir.previousDir=Prejšnja mapa:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Uporabi mapo profila %S
 dataDir.selectDir=Izberite podatkovno mapo Zotero
 dataDir.selectedDirNonEmpty.title=Mapa ni prazna
 dataDir.selectedDirNonEmpty.text=Mapa, ki ste jo izbrali, ni prazna in ni podatkovna mapa Zotero.\n\nŽelite kljub temu v tej mapi ustvariti datoteke Zotero?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Najdena obstoječa knjižnica Zotero
 dataDir.standaloneMigration.description=Kaže, da prvič uporabljate %1$S. Želite, da %1$S uvozi nastavitve iz programa %2$S ter uporabi vašo obstoječo mapo s podatki?
 dataDir.standaloneMigration.multipleProfiles=%1$S bo mapo s podatki delil z nazadnje uporabljenim profilom.\n
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Novo shranjeno iskanje
 pane.collections.savedSearchName=Vnesite ime za to shranjeno iskanje:
 pane.collections.rename=Preimenuj zbirko:
 pane.collections.library=Moja knjižnica
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Koš
 pane.collections.untitled=Neimenovano
 pane.collections.unfiled=Nerazvrščeno
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Ste prepričani, da želite izbrisati to značko
 pane.tagSelector.numSelected.none=0 značk izbranih
 pane.tagSelector.numSelected.singular=%S značka izbrana
 pane.tagSelector.numSelected.plural=%S značk izbranih
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Nalaganje seznama vnosov ...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Premakni v koš
 pane.items.trash=Ste prepričani, da želite izbrani vnos vreči v koš?
 pane.items.trash.multiple=Ste prepričani, da želite izbrane vnose vreči v koš?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S izbranih vnosov
 pane.item.unselected.zero=V tem pogledu ni vnosov
 pane.item.unselected.singular=Št. vnosov v tem pogledu: %S
 pane.item.unselected.plural=Št. vnosov v tem pogledu: %S
-pane.item.selectToMerge=Izberite vnose za spajanje
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Spremeni vrsto vnosa
 pane.item.changeType.text=Ste prepričani, da želite spremeniti vrsto vnosa?\n\nIzgubljena bodo naslednja polja:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S priponk:
 pane.item.attachments.count.singular=%S priponka:
 pane.item.attachments.count.plural=%S priponk:
 pane.item.attachments.select=Izberite datoteko
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=kliknite sem
-pane.item.tags=Značke:
 pane.item.tags.count.zero=%S značk:
 pane.item.tags.count.singular=%S značka:
 pane.item.tags.count.plural=%S značk:
 pane.item.tags.icon.user=Uporabniško dodana značka
 pane.item.tags.icon.automatic=Samodejno dodana značka
-pane.item.related=Sorodno:
 pane.item.related.count.zero=%S sorodnih:
 pane.item.related.count.singular=%S soroden:
 pane.item.related.count.plural=%S sorodnih:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Trenutno izbrani zbirki ne morete dodajati
 ingester.saveToZotero=Shrani v Zotero
 ingester.saveToZoteroUsing=Shrani v Zotero s pomočjo »%S«
 ingester.scraping=Shranjevanje vnosa ...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Vnos shranjen
 ingester.scrapeError=Vnosa ni mogoče shraniti
 ingester.scrapeErrorDescription=Napaka pri shranjevanju tega vnosa. Preverite %S za več podatkov.
@@ -428,12 +469,13 @@ ingester.importReferRISDialog.checkMsg=Vedno dovoli za to spletno mesto
 
 ingester.importFile.title=Uvozi datoteko
 ingester.importFile.text=Želite uvoziti datoteko »%S«?\n\nVnosi bodo dodani novi zbirki.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Izvajanje iskanja ...
 ingester.lookup.error=Pri izvajanju iskanja za ta predmet je prišlo do napake.
 
 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.
+db.dbCorrupted.restart=Ponovno zaženite %S, da sprožite samodejno obnovitev iz zadnje varnostne kopije.
 db.dbCorruptedNoBackup=Zbirka podatkov Zotero »%S« je očitno okvarjena in samodejna varnostna kopija ni na voljo.\n\nUstvarjena je bila nova zbirka podatkov. Okvarjena datoteka je bila shranjena v vašo mapo Zotero.
 db.dbRestored=Zbirka podatkov Zotero »%1$S« je očitno okvarjena.\n\nVaši podatki so bili obnovljeni iz zadnje samodejne varnostne kopije z dne %2$S iz %3$S. Okvarjena datoteka je bila shranjena v vašo mapo Zotero.
 db.dbRestoreFailed=Zbirka podatkov Zotero »%S« je očitno okvarjena in poskus obnovitve zadnje samodejne varnostne kopije ni uspel.\n\nUstvarjena je bila nova zbirka podatkov. Okvarjena datoteka je bila shranjena v vašo mapo Zotero.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Če je mogoče, odpri datoteke PDF in dr
 zotero.preferences.openurl.resolversFound.zero=Najdenih %S razločiteljev
 zotero.preferences.openurl.resolversFound.singular=Najden %S razločitelj
 zotero.preferences.openurl.resolversFound.plural=Najdenih %S razločiteljev
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Ponovno izdelaj kazalo
 zotero.preferences.search.rebuildWarning=Želite ponovno izdelati celotno kazalo? To je lahko zamudno.\n\nZa indeksiranje samo tistih vnosov, ki niso bili v kazalu, uporabite %S.
 zotero.preferences.search.clearIndex=Počisti kazalo
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Vsi novi ali spremenjen
 zotero.preferences.advanced.resetStyles=Ponastavi sloge
 zotero.preferences.advanced.resetStyles.changesLost=Vsi novi ali spremenjeni slogi bodo izgubljeni.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Naslednje datoteke so že obstajale v ciljni mapi in niso bile kopirane:
 dragAndDrop.filesNotFound=Naslednjih datotek ni mogoče najti, zato niso bile skopirane:
 
@@ -500,7 +559,8 @@ fileInterface.import=Uvozi
 fileInterface.export=Izvozi
 fileInterface.exportedItems=Izvoženi vnosi
 fileInterface.imported=Uvoženo
-fileInterface.fileFormatUnsupported=Za dano datoteko ni mogoče najti prevajalnika.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Neimenovana bibliografija
 fileInterface.bibliographyHTMLTitle=Bibliografija
 fileInterface.importError=Pri uvozu izbrane datoteke je prišlo do napake. Zagotovite, da je datoteka veljavna, nato poskusite znova.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Vnosi, ki ste jih izbrali, ne vsebujejo sklicev.
 fileInterface.bibliographyGenerationError=Pri tvorbi bibliografije je prišlo do napake. Poskusite znova.
 fileInterface.exportError=Pri poskusu izvoza izbrane datoteke je prišlo do napake.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Napredni iskalni način - pritisnite vnašalko za iskanje.
 searchInProgress=Iskanje je v teku — prosimo, počakajte.
 
@@ -613,6 +677,7 @@ integration.cited.loading=Nalaganje citiranih vnosov ...
 integration.ibid=isto
 integration.emptyCitationWarning.title=Prazen citat
 integration.emptyCitationWarning.body=Citat, ki ste ga navedli, bi bil prazen v trenutno izbranem slogu. Ste prepričani, da ga želite dodati?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Ta različica razširitve Zotero za urejevalnik besedila ($INTEGRATION_VERSION) ni združljiva s trenutno nameščeno različico razširitve Zotero (%1$S). Zagotovite, da uporabljate najnovejše različice obeh komponent.
 integration.error.incompatibleVersion2=Zotero %1$S potrebuje %2$S %3$S ali novejšo. Najnovejšo različico %2$S prenesite z zotero.org.
@@ -643,14 +708,22 @@ integration.citationChanged=Ta navedek ste spremenili, odkar ga je Zotero izdela
 integration.citationChanged.description=S klikom »Da« boste preprečili Zoteru, da posodobi navedek, če dodate dodatne navedke, spremenite sloge ali spremenite sklic, kamor se sklicuje. S klikom »Ne« boste izbrisali vse spremembe.
 integration.citationChanged.edit=Ta navedek ste spremenili, odkar ga je Zotero izdelal. Z urejanjem boste počistili svoje spremembe. Želite nadaljevati?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Želite namestiti slog »%1$S« iz %2$S?
 styles.updateStyle=Želite posodobiti obstoječi slog »%1$S« z »%2$S« iz %3$S?
 styles.installed=Slog »%S« je bil uspešno nameščen.
 styles.installError=%S ni videti veljavna slogovna datoteka.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=$1$S se sklicuje na neveljavno ali neobstoječo datoteko CSL v %2$S kot njenem viru.
 styles.deleteStyle=Ste prepričani, da želite izbrisati slog »%1$S«?
 styles.deleteStyles=Ste prepričani, da želite izbrisati izbrane sloge?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Prekliči usklajevanje
 sync.openSyncPreferences=Odpri nastavitve usklajevanja ...
 sync.resetGroupAndSync=Ponastavi skupino in usklajevanje
@@ -660,8 +733,10 @@ sync.remoteObject=Oddaljeni predmet
 sync.mergedObject=Spojeni predmet
 
 sync.error.usernameNotSet=Uporabniško ime ni določeno
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Geslo ni določeno
 sync.error.invalidLogin=Neveljavno uporabniško ime ali geslo
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Vnesite geslo.
 sync.error.loginManagerCorrupted1=Zotero ne more dostopati do vaših prijavnih podatkov, najverjetneje je zbirka podatkov upravitelja prijav programa %S okvarjena.
 sync.error.loginManagerCorrupted2=Zaprite %1$S, naredite varnostno kopijo in izbrišite signons.* iz svojega profila %2$S, nato ponovno vnesite prijavne podatke Zotero v podoknu Usklajevanje v nastavitvah Zotera.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Če nadaljujete bo kopija skupine ponastavljena na n
 sync.error.copyChangedItems=Če bi radi kopirali svoje spremembe drugam ali od skrbnika skupine zahtevali pravice za pisanje, takoj prekinite usklajevanje.
 sync.error.manualInterventionRequired=Samodejno usklajevanje je povzročilo spor, ki zahteva ročno posredovanje.
 sync.error.clickSyncIcon=Kliknite ikono usklajevanja, če želite ročno usklajevanje.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Še ni usklajeno
 sync.status.lastSync=Zadnja uskladitev:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Prenašanje podatkov na uskladitveni strežnik
 sync.status.uploadAccepted=Prenos na strežnik je sprejet - čakanje na uskladitveni strežnik
 sync.status.syncingFiles=Usklajevanje datotek
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB prostora
 sync.storage.filesRemaining=%1$S/%2$S datotek
 sync.storage.none=Brez
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Krajevna datoteka
 sync.storage.remoteFile=Oddaljena datoteka
 sync.storage.savedFile=Shranjena datoteka
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Prilagoditev strežnika preverjena
 sync.storage.fileSyncSetUp=Usklajevanje datotek je uspešno nastavljeno.
 sync.storage.openAccountSettings=Odpri nastavitve računa
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Strežnika %S ni mogoče doseči.
 sync.storage.error.permissionDeniedAtAddress=Nimate pravic za ustvarjanje mape Zotero na naslednjem naslovu:
 sync.storage.error.checkFileSyncSettings=Preverite svoje nastavitve usklajevanja ali povprašajte svojega sistemskega skrbnika.
 sync.storage.error.verificationFailed=Overjanje $S ni uspelo. Preverite nastavitve usklajevanja datotek v podoknu Usklajevanje v nastavitvah Zotera.
 sync.storage.error.fileNotCreated=Datoteke »%S« ni mogoče ustvariti v mapi »shrambe« (»storage«) Zotero.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=V skupini Zotero  »%S« nimate več pravic urejanja in datotek, ki ste jih dodali ali uredili, ni več mogoče usklajevati s strežnikom.
 sync.storage.error.copyChangedItems=Če želite kopirati spremenjene vnose drugam, takoj prekinite usklajevanje.
 sync.storage.error.fileUploadFailed=Prenos datoteke na strežnik ni uspel.
 sync.storage.error.directoryNotFound=Mape ni mogoče najti
 sync.storage.error.doesNotExist=%S ne obstaja.
 sync.storage.error.createNow=Ga želite ustvariti zdaj?
-sync.storage.error.webdav.enterURL=Vnesite URL za WebDAV.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S ni veljaven URL za WebDAV.
 sync.storage.error.webdav.invalidLogin=Strežnik WebDAV ni sprejel uporabniškega imena in gesla, ki ste ju vnesli.
 sync.storage.error.webdav.permissionDenied=Nimate dovoljenja za dostop do %S na strežniku WebDAV.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=Napaka povezave SSL pri povezovanju
 sync.storage.error.webdav.loadURLForMoreInfo=Naložite URL svojega WebDAV v brskalniku, če želite več informacij.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Če vas zanima več o preglasitvi potrdil, si oglejte dokumentacijo.
 sync.storage.error.webdav.loadURL=Naloži URL WebDAV
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Dosegli ste mejno kvoto hrambe datotek Zotero. Nekatere datoteke niso bile prenesene na strežnik. Drugi podatki Zotero se bodo še naprej usklajevali s strežnikom.
 sync.storage.error.zfs.personalQuotaReached2=Oglejte si nastavitve svojega računa zotero.org, kjer najdete dodatne možnosti hrambe.
 sync.storage.error.zfs.groupQuotaReached1=Skupina »%S« je dosegla svojo mejno kvoto hrambe datotek Zotero. Nekatere datoteke niso bile prenesene na strežnik. Drugi podatki Zotero se bodo še naprej usklajevali s strežnikom.
 sync.storage.error.zfs.groupQuotaReached2=Lastnik skupine lahko poveča kapaciteto shrambe skupine v odseku nastavitev shrambe na zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Shrani značko
 sync.longTagFixer.saveTags=Shrani značke
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Besedila iz PDF ni mogoče prebrati.
 recognizePDF.noMatches=Ni zadetkov med sklici.
 recognizePDF.fileNotFound=Datoteke ni mogoče najti.
 recognizePDF.limit=Omejitev poizvedovanja dosežena. Poskusite znova kasneje.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Pridobivanje metapodatkov dokončano.
 recognizePDF.close.label=Zapri
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Obogateno besedilo (.rtf)
 rtfScan.saveTitle=Izberite, kam želite shraniti oblikovano datoteko
 rtfScan.scannedFileSuffix=(pregledano)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Poizvedba ni uspela
 lookup.failure.description=Zotero ne more najti zapisa za navedeni identifikator. Preverite identifikator in poskusite znova.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Pokaži na spletu
 locate.online.tooltip=Oglej si ta vnos na spletu
diff --git a/chrome/locale/sr-RS/zotero/about.dtd b/chrome/locale/sr-RS/zotero/about.dtd
index 9c6403250f..8ee9d0d6c7 100644
--- a/chrome/locale/sr-RS/zotero/about.dtd
+++ b/chrome/locale/sr-RS/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Посебне захвалнице:">
 <!ENTITY zotero.about.close "Затвори">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/sr-RS/zotero/preferences.dtd b/chrome/locale/sr-RS/zotero/preferences.dtd
index 88733c15d4..ef1460fefe 100644
--- a/chrome/locale/sr-RS/zotero/preferences.dtd
+++ b/chrome/locale/sr-RS/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Подразумевано:">
 <!ENTITY zotero.preferences.items "ставке">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Опште">
 
@@ -59,9 +60,14 @@
 <!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.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.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.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.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">
@@ -70,6 +76,7 @@
 <!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 "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reset...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Добави додатне стилове...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Пречице на тастатури">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Any string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Напредно">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Изабери...">
 <!ENTITY zotero.preferences.dataDir.reveal "Прикажи директоријум података">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Одржавање базе података">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Провери целовитост базе података">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Постави на почетне вредности преводиоце и стилове...">
diff --git a/chrome/locale/sr-RS/zotero/standalone.dtd b/chrome/locale/sr-RS/zotero/standalone.dtd
index f63a223052..e02c6a5a54 100644
--- a/chrome/locale/sr-RS/zotero/standalone.dtd
+++ b/chrome/locale/sr-RS/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/sr-RS/zotero/zotero.dtd b/chrome/locale/sr-RS/zotero/zotero.dtd
index 317a23ee7a..a5847570a7 100644
--- a/chrome/locale/sr-RS/zotero/zotero.dtd
+++ b/chrome/locale/sr-RS/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Уреди">
 <!ENTITY zotero.general.delete "Обриши">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Дневник грешака може да садржи поруке невезане за Зотеро.">
 <!ENTITY zotero.errorReport.submissionInProgress "Сачекајте док се извештај о грешци шаље.">
 <!ENTITY zotero.errorReport.submitted "Извештај о грешци је послат.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Оставите поруку на форуму за Зотеро (forums.zotero.org) са овим бројем извештаја, описом проблема и свим корацима потребним да се понови грешка.">
 <!ENTITY zotero.errorReport.notReviewed "Извештаји о грешкама се обично не прегледају, осим ако се не помињу у форумима.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Инсталирали сте нову верзију Зотера.">
 <!ENTITY zotero.upgrade.upgradeRequired "Ваша Зотеро база података мора бити надограђена да би радила са новом верзијом.">
 <!ENTITY zotero.upgrade.autoBackup "Резерва за вашу постојећу базу података ће бити аутоматски направљена пре било које измене.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Права">
 <!ENTITY zotero.items.dateAdded_column "Датум додавања">
 <!ENTITY zotero.items.dateModified_column "Датум промене">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Прикажи у библиотеци">
 <!ENTITY zotero.items.menu.attach.note "Додај белешку">
@@ -76,7 +94,7 @@
 <!ENTITY zotero.toolbar.newItem.label "Нова ставка">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Више">
 <!ENTITY zotero.toolbar.newItemFromPage.label "Направи нову ставку од тренутне странице">
-<!ENTITY zotero.toolbar.lookup.label "Add Item by Identifier">
+<!ENTITY zotero.toolbar.lookup.label "Add Item(s) by Identifier">
 <!ENTITY zotero.toolbar.removeItem.label "Избаци ставку...">
 <!ENTITY zotero.toolbar.newCollection.label "Нова збирка...">
 <!ENTITY zotero.toolbar.newGroup "Нова група...">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Преиначи текст">
 <!ENTITY zotero.item.textTransform.titlecase "Величина слова у наслову">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "New Note">
 <!ENTITY zotero.toolbar.note.standalone "Нова самостална белешка">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Изабери видљиве">
 <!ENTITY zotero.tagSelector.clearVisible "Избаци из избора видљиве">
 <!ENTITY zotero.tagSelector.clearAll "Избаци из избора све">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Преименуј ознаку...">
 <!ENTITY zotero.tagSelector.deleteTag "Избриши ознаку...">
 
-<!ENTITY zotero.lookup.description "Enter the ISBN, DOI, or PMID to look up in the box below.">
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
+<!ENTITY zotero.lookup.description "Enter one or more ISBNs, DOIs, or PMIDs to look up in the box below.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Изабери ставке">
 <!ENTITY zotero.selectitems.intro.label "Изабери које ставке бисте желели додати у вашу библиотеку">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Необележене ознаке неће бити сачуване.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Ознака ће бити избрисана ис свих ставки">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Прокси је препознат">
 <!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/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties
index 628eedcd44..a3603c2789 100644
--- a/chrome/locale/sr-RS/zotero/zotero.properties
+++ b/chrome/locale/sr-RS/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Поново покрени касније
 general.restartApp=Restart %S
 general.errorHasOccurred=Дошло је до грешке.
 general.unknownErrorOccurred=Дошло је до непознате грешке.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Поново покрените Фајерфокс
 general.restartFirefoxAndTryAgain=Поново покрените Фајерфокс и покушајте поново.
 general.checkForUpdate=Проверите за ажурирања
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Погледајте %S за више информ
 general.enable=Укључи
 general.disable=Искључи
 general.remove=Remove
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Зотерова операција се обавља.
 general.operationInProgress.waitUntilFinished=Сачекајте док се не заврши.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Притисните %S да пошаљете изв
 errorReport.stepsToReproduce=Кораци за репродукцију:
 errorReport.expectedResult=Очекивани резултати:
 errorReport.actualResult=Стварни резултат:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Зотеро подаци се нису могли наћи.
 dataDir.previousDir=Предходни директоријум:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Користи директоријум за Firefox пр
 dataDir.selectDir=Изабери директоријум за Зотеро податке
 dataDir.selectedDirNonEmpty.title=Директоријум није празан
 dataDir.selectedDirNonEmpty.text=Директоријум који сте изабрали није празан и не изгледа као Зотеро директоријум за податке.\n\n Да се направе Зотеро датотеке у овом директоријуму свакако?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Нова сачувана претрага
 pane.collections.savedSearchName=Упишите назив за ову сачувану претрагу:
 pane.collections.rename=Преименуј збирку:
 pane.collections.library=Моја библиотека
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Избрисано
 pane.collections.untitled=Безимено
 pane.collections.unfiled=Unfiled Items
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Да ли сте сигурни да желит
 pane.tagSelector.numSelected.none=0 ознака изабрано
 pane.tagSelector.numSelected.singular=%S ознака изабрана
 pane.tagSelector.numSelected.plural=%S ознаке(а) изабране
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Учитавам списак ставки...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Премести у корпу за отпатке
 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?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S изабраних ставки
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Промени врсту ставке
 pane.item.changeType.text=Да ли сте сигурни да желите променити врсту ставке?\n\nСледећа поља ће бити изгубљена:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S прилога:
 pane.item.attachments.count.singular=%S прилог:
 pane.item.attachments.count.plural=%S прилога:
 pane.item.attachments.select=Изабери датотеку
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=Кликни овде
-pane.item.tags=Ознаке:
 pane.item.tags.count.zero=%S ознака:
 pane.item.tags.count.singular=%S ознака:
 pane.item.tags.count.plural=%S ознаке(а):
 pane.item.tags.icon.user=Ознаке додане од стране корисника
 pane.item.tags.icon.automatic=Самостално додане ознаке
-pane.item.related=Сродно:
 pane.item.related.count.zero=%S сродних
 pane.item.related.count.singular=%S сродна:
 pane.item.related.count.plural=%S сродне(их):
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Сачувај у Зотеру
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=Чувам ставку...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Ставка сачувана.
 ingester.scrapeError=Нисам могао сачувати ставку.
 ingester.scrapeErrorDescription=Грешка је начињена током чувања ове ставке. Погледајте %S за више података.
@@ -427,7 +468,8 @@ ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S система за решавање нађено
 zotero.preferences.openurl.resolversFound.singular=%S систем за решавање нађен
 zotero.preferences.openurl.resolversFound.plural=%S система за решавања нађено
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Поново изгради индекс
 zotero.preferences.search.rebuildWarning=Да ли желите изградити читав индекс? Ово може узети доста времена.\n\nДа би индексирали само ставке које нису биле индексиране користите %S.
 zotero.preferences.search.clearIndex=Очисти индекс
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Сви нови или
 zotero.preferences.advanced.resetStyles=Постави на почетне вредности стилове
 zotero.preferences.advanced.resetStyles.changesLost=Сви нови или измењени стилови ће бити изгубљени.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Следеће датотеке већ постоје у одредишном директоријуму и нису умножене:
 dragAndDrop.filesNotFound=Следеће датотеке нису нађене и због тога нису умножене:
 
@@ -500,7 +559,8 @@ fileInterface.import=Увоз
 fileInterface.export=Извоз
 fileInterface.exportedItems=Изведене ставке
 fileInterface.imported=Увезено
-fileInterface.fileFormatUnsupported=Преводилац за дату датотеку се није могао наћи.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Безимена библиографија
 fileInterface.bibliographyHTMLTitle=Библиографија
 fileInterface.importError=Грешка се десила током покушаја увеза изабране датотеке. Молим проверите исправност датотеке и покушајте поново.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Ставке које сте изабрали н
 fileInterface.bibliographyGenerationError=Грешка се десила током прављења библиографије. Покушајте поново.
 fileInterface.exportError=Грешка се десила током покушаја извоза изабране датотеке.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Напредни режим претраге -- притисните Enter за претрагу.
 searchInProgress=Претрага у току -- молим сачекајте.
 
@@ -613,11 +677,12 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Blank Citation
 integration.emptyCitationWarning.body=The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Error
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Zotero experienced an error updating your document.
 integration.error.mustInsertCitation=You must insert a citation before performing this operation.
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Инсталирати стил „%1$S“ из %2$S?
 styles.updateStyle=Ажурирати постојећи стил „%1$S“ са „%2$S“ из %3$S?
 styles.installed=Стил „%S“ је успешно инсталиран.
-styles.installError=%S does not appear to be a valid style file.
+styles.installError="%S" is not a valid style file.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 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?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancel Sync
 sync.openSyncPreferences=Open Sync Preferences...
 sync.resetGroupAndSync=Reset Group and Sync
@@ -660,18 +733,55 @@ sync.remoteObject=Remote Object
 sync.mergedObject=Merged Object
 
 sync.error.usernameNotSet=Username not set
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Password not set
 sync.error.invalidLogin=Invalid username or password
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 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 %S.
+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 '%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.error.manualInterventionRequired=Conflicts have suspended automatic syncing.
+sync.error.clickSyncIcon=Click the sync icon to resolve them.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Not yet synced
 sync.status.lastSync=Last sync:
@@ -682,9 +792,12 @@ 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.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB remaining
 sync.storage.filesRemaining=%1$S/%2$S files
 sync.storage.none=None
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Local File
 sync.storage.remoteFile=Remote File
 sync.storage.savedFile=Saved File
@@ -692,17 +805,23 @@ sync.storage.serverConfigurationVerified=Server configuration verified
 sync.storage.fileSyncSetUp=File sync is successfully set up.
 sync.storage.openAccountSettings=Open Account Settings
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=The server %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=%S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
 sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=You no longer have file editing access to the Zotero group '%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=%S does not exist.
 sync.storage.error.createNow=Do you want to create it now?
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
 sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1=The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2=The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Save Tag
 sync.longTagFixer.saveTags=Save Tags
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Could not read text from PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=File not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Close
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(Scanned)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/sv-SE/zotero/about.dtd b/chrome/locale/sv-SE/zotero/about.dtd
index 7fce80ad22..eaa17d0bc6 100644
--- a/chrome/locale/sv-SE/zotero/about.dtd
+++ b/chrome/locale/sv-SE/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Särskilt tack:">
 <!ENTITY zotero.about.close "Stäng">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Vi vill också tacka...">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/sv-SE/zotero/preferences.dtd b/chrome/locale/sv-SE/zotero/preferences.dtd
index 07dfdb4960..8ed4903d6b 100644
--- a/chrome/locale/sv-SE/zotero/preferences.dtd
+++ b/chrome/locale/sv-SE/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Standardvärde:">
 <!ENTITY zotero.preferences.items "Källor">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Allmänt">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Synkronisera bifogade filer i mitt bibliotek med:">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Synkronisera bifogade filer i gruppens bibliotek med Zotero Storage">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "Om filsynkronisering">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Genom att använda Zotero Storage går du med på deras">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "avtalsvillkor">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Komplett synkronisering med Zotero Server">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Sammanfoga lokala Zoterodata med data från synkroniseringsservern, utan att ta hänsyn till historik.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Återställ från Zotero Server">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Byt ut allt innehåll på Zotero Server mot lokala Zoterodata.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Återställ filsynkroniseringshistorik">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Tvinga Zotero Server att säkerhetskontrollera alla lokala bifogade filer.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Återställ...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titel">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Uppdaterad">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Lägg till ytterligare stilar...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Snabbkommandon">
@@ -154,13 +162,14 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Vilken sträng som helst">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Avancerat">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Hitta">
-<!ENTITY zotero.preferences.locate.locateEngineManager "Hantera sökjänst för artiklar">
+<!ENTITY zotero.preferences.locate.locateEngineManager "Hantera söktjänst för artiklar">
 <!ENTITY zotero.preferences.locate.description "Beskrivning">
 <!ENTITY zotero.preferences.locate.name "Namn">
 <!ENTITY zotero.preferences.locate.locateEnginedescription "En söktjänst förbättrar funktionerna i Hitta-menyn ovanför Infofliken. Genom att aktivera söktjänsterna nedan läggs de till Hitta-menyn och kan användas för att hitta källor på ditt bibliotek eller på nätet.">
-<!ENTITY zotero.preferences.locate.addDescription "För att lägga till en söktjänst som inte finns på listan, gå till söktjänstens hemsida  och lägg till den i Firefox sökruta. När du öppnar den här sidan igen kommer den nya söktjänsten att finnas med på listan.">
+<!ENTITY zotero.preferences.locate.addDescription "För att lägga till en söktjänst som inte finns på listan, gå till söktjänstens hemsida i din webbläsare och välj &#34;Lägg till&#34; från Zoteros Hitta-meny.">
 <!ENTITY zotero.preferences.locate.restoreDefaults "Återställ till standard">
 
 <!ENTITY zotero.preferences.charset "Teckenkod">
@@ -168,11 +177,17 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Visa val för teckenkod vid export">
 
 <!ENTITY zotero.preferences.dataDir "Lagringsplats">
-<!ENTITY zotero.preferences.dataDir.useProfile "Använd profilkatalogen för Firefox">
+<!ENTITY zotero.preferences.dataDir.useProfile "Använd profilkatalog">
 <!ENTITY zotero.preferences.dataDir.custom "Egen:">
 <!ENTITY zotero.preferences.dataDir.choose "Välj...">
 <!ENTITY zotero.preferences.dataDir.reveal "Visa datakatalog">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Databasunderhåll">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Undersök om databasen är oskadd">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Återställ källfångare och stilar...">
diff --git a/chrome/locale/sv-SE/zotero/zotero.dtd b/chrome/locale/sv-SE/zotero/zotero.dtd
index e1044091ad..1efd8f8613 100644
--- a/chrome/locale/sv-SE/zotero/zotero.dtd
+++ b/chrome/locale/sv-SE/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Ändra">
 <!ENTITY zotero.general.delete "Radera">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Felloggen kan innehålla meddelanden som inte har med Zotero att göra.">
 <!ENTITY zotero.errorReport.submissionInProgress "Var vänlig vänta medan felrapporten skickas.">
 <!ENTITY zotero.errorReport.submitted "Felrapporten har skickats.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Skriv ett meddelande på Zoteros forum (forums.zotero.org) med detta rapport-ID, en beskrivning av problemet, och vad man behöver göra för att få samma fel igen.">
 <!ENTITY zotero.errorReport.notReviewed "Felrapporter brukar inte kontrolleras om ingen skriver om dem på forumen.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Du har installerat en ny version av Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Din Zoterodatabas måste uppgraderas för att fungera med den nya versionen.">
 <!ENTITY zotero.upgrade.autoBackup "Din existerande databas kommer att säkerhetskopieras innan några ändringar görs.">
@@ -31,7 +33,7 @@
 <!ENTITY zotero.contextMenu.saveImageAsItem "Spara bild som en Zotero-källa">
 
 <!ENTITY zotero.tabs.info.label "Information">
-<!ENTITY zotero.tabs.notes.label "Anteckningar">
+<!ENTITY zotero.tabs.notes.label "Fotnot">
 <!ENTITY zotero.tabs.attachments.label "Bilagor">
 <!ENTITY zotero.tabs.tags.label "Etiketter">
 <!ENTITY zotero.tabs.related.label "Liknande källor">
@@ -56,7 +58,22 @@
 <!ENTITY zotero.items.rights_column "Rättigheter">
 <!ENTITY zotero.items.dateAdded_column "Tillagt datum">
 <!ENTITY zotero.items.dateModified_column "Ändrat datum">
-<!ENTITY zotero.items.numChildren_column "+">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Visa i bibliotek">
 <!ENTITY zotero.items.menu.attach.note "Lägg till anteckning">
@@ -104,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Omvandla text">
 <!ENTITY zotero.item.textTransform.titlecase "engelsk titelskrivning">
 <!ENTITY zotero.item.textTransform.sentencecase "Vanlig versalisering">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Ny anteckning">
 <!ENTITY zotero.toolbar.note.standalone "Ny fristående anteckning">
@@ -121,17 +139,25 @@
 <!ENTITY zotero.tagSelector.selectVisible "Välj synliga">
 <!ENTITY zotero.tagSelector.clearVisible "Välj bort synliga">
 <!ENTITY zotero.tagSelector.clearAll "Välj bort alla">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Ändra namn på etikett...">
 <!ENTITY zotero.tagSelector.deleteTag "Radera etikett...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "Skriv ISBN, DOI, eller PMID i sökfältet nedan.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Välj källor">
 <!ENTITY zotero.selectitems.intro.label "Välj vilka källor du vill lägga till i ditt bibliotek">
 <!ENTITY zotero.selectitems.cancel.label "Ångra">
 <!ENTITY zotero.selectitems.select.label "Ok">
 
-<!ENTITY zotero.bibliography.title "Skapa källförteckning">
+<!ENTITY zotero.bibliography.title "Skapa citering/källförteckning">
 <!ENTITY zotero.bibliography.style.label "Referensstil">
 <!ENTITY zotero.bibliography.outputMode "Utmatningsläge">
 <!ENTITY zotero.bibliography.bibliography "Källförteckning">
@@ -191,7 +217,7 @@
 <!ENTITY zotero.integration.showEditor.label "Visa redigerare">
 <!ENTITY zotero.integration.classicView.label "Klassisk vy">
 
-<!ENTITY zotero.integration.references.label "Innehåll i källförteckningen">
+<!ENTITY zotero.integration.references.label "Referenser i källförteckningen">
 
 <!ENTITY zotero.sync.button "Synkronisera med Zoteros server">
 <!ENTITY zotero.sync.error "Synkroniseringsfel">
@@ -209,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Omarkerade etiketter kommer inte att sparas.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Etiketten kommer att raderas från alla källor.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Proxy hittad">
 <!ENTITY zotero.proxy.recognized.warning "Lägg bara till proxies från ditt bibliotek, din skola, eller från ett känt företag">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Andra proxies kan innehålla ond kod och låtsas vara hemsidor du litar på.">
diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties
index 8644d786f9..c37669a438 100644
--- a/chrome/locale/sv-SE/zotero/zotero.properties
+++ b/chrome/locale/sv-SE/zotero/zotero.properties
@@ -7,15 +7,18 @@ general.dontShowWarningAgain=Visa inte denna varning igen
 general.browserIsOffline=%S är för närvarande i offlineläge
 general.locate=Lokalisera...
 general.restartRequired=Omstart krävs
-general.restartRequiredForChange=Firefox måste startas om för att ändringen ska gälla
-general.restartRequiredForChanges=Firefox måste startas om för att ändringarna ska gälla
+general.restartRequiredForChange=%S måste startas om för att ändringen ska gälla
+general.restartRequiredForChanges=%S måste startas om för att ändringarna ska gälla
 general.restartNow=Starta om nu
 general.restartLater=Starta om senare
 general.restartApp=Starta om %S
 general.errorHasOccurred=Ett fel har uppstått
 general.unknownErrorOccurred=Ett okänt fel har uppstått
-general.restartFirefox=Var vänlig starta om Firefox
-general.restartFirefoxAndTryAgain=Var vänlig starta om Firefox och försök igen
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
+general.restartFirefox=Var vänlig starta om %S
+general.restartFirefoxAndTryAgain=Var vänlig starta om %S och försök igen
 general.checkForUpdate=Kolla efter uppdatering
 general.actionCannotBeUndone=Detta kan inte ångras.
 general.install=Installera
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Se %S för mer information.
 general.enable=Sätt på
 general.disable=Stäng av
 general.remove=Ta bort
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Öppna dokumentation
 general.numMore=%S ytterligare…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Zotero arbetar just nu.
 general.operationInProgress.waitUntilFinished=Vänta till åtgärden är klar.
@@ -57,7 +64,7 @@ upgrade.advanceMessage=Tryck %S för att uppgradera nu.
 upgrade.dbUpdateRequired=Zoterodatabasen måste uppdateras.
 upgrade.integrityCheckFailed=Din Zoterodatabas måste repairas innan uppgraderingen kan fortsätta.
 upgrade.loadDBRepairTool=Ladda verktyg för att reparera databasen
-upgrade.couldNotMigrate=Zotero kunde inte flytta alla nödvändiga filer.\n Stäng alla öppna bifogade filer, starta om Firefox och försök uppgradera igen.
+upgrade.couldNotMigrate=Zotero kunde inte flytta alla nödvändiga filer.\n Stäng alla öppna bifogade filer, starta om %S och försök uppgradera igen.
 upgrade.couldNotMigrate.restart=Om du fortsätter få det här meddelandet bör du starta om datorn.
 
 errorReport.reportError=Rapportera felet...
@@ -68,13 +75,33 @@ errorReport.advanceMessage=Tryck %S för att skicka en felrapport till utvecklar
 errorReport.stepsToReproduce=Vad gör man för att återskapa felet?
 errorReport.expectedResult=Förväntat resultat:
 errorReport.actualResult=Faktiskt resultat:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Datakatalogen för Zotero kunde inte hittas.
 dataDir.previousDir=Föregående katalog
-dataDir.useProfileDir=Använd Firefox profilkatalog
+dataDir.useProfileDir=Använd %S profilkatalog
 dataDir.selectDir=Välj en datakatalog för Zotero
 dataDir.selectedDirNonEmpty.title=Katalogen är inte tom
 dataDir.selectedDirNonEmpty.text=Katalogen du valt är inte tom eller verkar inte vara en datakatalog för Zotero.\n\nSkapa Zotero-filer i den här katalogen ändå?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Ett befintligt Zotero-bibliotek hittades
 dataDir.standaloneMigration.description=Detta verkar vara första gången du använder %1$S. Vill du att %1$S ska hämta inställningarna från %2$S och använda din befintliga källkatalog?
 dataDir.standaloneMigration.multipleProfiles=%1$S kommer att dela sin källkatalog med den senast använda profilen.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Ny sparad sökning
 pane.collections.savedSearchName=Skriv in ett namn för den här sparade sökningen:
 pane.collections.rename=Ändra namn på samling:
 pane.collections.library=Mitt bibliotek
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Papperskorg
 pane.collections.untitled=Utan titel
 pane.collections.unfiled=Oregistrerade källor
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Denna etikett kommer att tas bort från alla fil
 pane.tagSelector.numSelected.none=Ingen etikett vald
 pane.tagSelector.numSelected.singular=%S etikett vald
 pane.tagSelector.numSelected.plural=%S etiketter valda
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Laddar lista med källor...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Flytta till papperskorgen
 pane.items.trash=Är du säker på att du vill flytta den valda källan till papperskorgen?
 pane.items.trash.multiple=Är du säker på att du vill flytta de valda källorna till papperskorgen?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S källor valda
 pane.item.unselected.zero=Inga källor i denna vy
 pane.item.unselected.singular=%S källa i denna vy
 pane.item.unselected.plural=%S källor i denna vy
-pane.item.selectToMerge=Välj källor att sammanfoga
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Ändra källtyp
 pane.item.changeType.text=Är du säker på att du vill ändra källtyp?\n\nFöljande fält kommer att försvinna:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S bifogade dokument:
 pane.item.attachments.count.singular=%S bifogat dokument:
 pane.item.attachments.count.plural=%S bifogade dokument:
 pane.item.attachments.select=Välj en fil
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=klicka här
-pane.item.tags=Etiketter:
 pane.item.tags.count.zero=%S etiketter:
 pane.item.tags.count.singular=%S etikett:
 pane.item.tags.count.plural=%S etiketter:
 pane.item.tags.icon.user=Etikett tillagd av användare
 pane.item.tags.icon.automatic=Etikett tillagd automatiskt
-pane.item.related=Liknande källor:
 pane.item.related.count.zero=Ingen liknande källa.
 pane.item.related.count.singular=En liknande källa:
 pane.item.related.count.plural=%S liknande källor:
@@ -340,7 +380,7 @@ itemFields.university=Universitet
 itemFields.abstractNote=Sammanfattning
 itemFields.websiteTitle=Titel på webbplats
 itemFields.reportNumber=Rapportnummer
-itemFields.billNumber=Förarbetets referensnummer
+itemFields.billNumber=Förarbetets ref. nr.
 itemFields.codeVolume=Lagband
 itemFields.codePages=Sidkod
 itemFields.dateDecided=Avgörandedatum
@@ -380,7 +420,7 @@ creatorTypes.director=Regissör
 creatorTypes.scriptwriter=Manusförfattare
 creatorTypes.producer=Producent
 creatorTypes.castMember=Skådespelare
-creatorTypes.sponsor=Motionär
+creatorTypes.sponsor=Förslagsläggare
 creatorTypes.counsel=Handledare
 creatorTypes.inventor=Uppfinnare
 creatorTypes.attorneyAgent=Ombud/Agent
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Du kan inte lägga till filer i den valda
 ingester.saveToZotero=Spara i Zotero
 ingester.saveToZoteroUsing=Spara i Zotero med "%S"
 ingester.scraping=Sparar källa...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Källa sparad
 ingester.scrapeError=Källan kunde inte sparas
 ingester.scrapeErrorDescription=Ett fel uppstod när källan skulle sparas. Se %S för mer information.
@@ -428,12 +469,13 @@ ingester.importReferRISDialog.checkMsg=Tillåt alltid för denna sida
 
 ingester.importFile.title=Importera fil
 ingester.importFile.text=Vill du importera filen "%S"?\n\nInnehållet kommer att läggas i en ny samling.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Eftersöker källan...
 ingester.lookup.error=Ett fel uppstod när källan eftersöktes.
 
 db.dbCorrupted=Zotero-databasen '%S' verkar ha gått sönder.
-db.dbCorrupted.restart=Var vänlig starta om Firefox för att försöka automatisk återställning till den senaste säkerhetskopian.
+db.dbCorrupted.restart=Var vänlig starta om %S för att försöka automatisk återställning till den senaste säkerhetskopian.
 db.dbCorruptedNoBackup=Zoterodatabasen '%S' verkar ha gått sönder, och ingen automatisk säkerhetskopia finns tillgänglig.\n\nEn ny databasfil har skapats. Den skadade filen sparades i din Zoterokatalog.
 db.dbRestored=Zoterodatabasen '%1$S' verkar ha gått sönder.\n\nDina data återskapades från den senaste säkerhetskopian som gjordes %2$S kl. %3$S. Den skadade filen sparades i din Zoterokatalog.
 db.dbRestoreFailed=Zoterodatabasen '%S' verkar ha gått sönder, och ett försök att återskapa den från den senaste säkerhetskopian misslyckades.\n\nEn ny databasfil har skapats. Den skadade filen sparades i din Zoterokatalog.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Öppna PDF:er och andra filer i %S när
 zotero.preferences.openurl.resolversFound.zero=Inga länkservrar hittades
 zotero.preferences.openurl.resolversFound.singular=En länkserver hittades
 zotero.preferences.openurl.resolversFound.plural=%S länkservrar hittades
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Bygg om index
 zotero.preferences.search.rebuildWarning=Vill du bygga om hela indexet? Det kan ta ett tag.\n\nFör att bara indexera källor som inte tidigare indexerats, använd %S.
 zotero.preferences.search.clearIndex=Nollställ index
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Alla nya eller ändrade
 zotero.preferences.advanced.resetStyles=Återställ referensstilar
 zotero.preferences.advanced.resetStyles.changesLost=Alla nya eller ändrade referensstilar kommer att förloras.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Följande filer fanns redan i målkatalogen och kopierades inte:
 dragAndDrop.filesNotFound=Följande filer hittades inte och kunde inte kopieras:
 
@@ -500,7 +559,8 @@ fileInterface.import=Importera
 fileInterface.export=Exportera
 fileInterface.exportedItems=Exporterade källor
 fileInterface.imported=Importerat
-fileInterface.fileFormatUnsupported=Ingen källfångare för filen kunde hittas.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Källförteckning utan titel
 fileInterface.bibliographyHTMLTitle=Källförteckning
 fileInterface.importError=Ett fel uppstod när den valda filen skulle importeras. Var vänlig se till att filen är giltig och försök sedan igen.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Dokumenten du valt innehåller inga källhänvis
 fileInterface.bibliographyGenerationError=Ett fel uppstod när din källförteckning skulle skapas. Försök igen.
 fileInterface.exportError=Ett fel uppstod när den valda filen skulle exporteras.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Avancerad sökning - tryck Retur för att söka.
 searchInProgress=Sökning pågår - var vänlig vänta.
 
@@ -613,11 +677,12 @@ integration.cited.loading=Laddar citeringar...
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Tom källhänvisning
 integration.emptyCitationWarning.body=Källhänvisningen som du valt kommer att bli tom i den nu valda referensmallen. Är du säker på att du vill lägga till den?
+integration.openInLibrary=Open in %S
 
-integration.error.incompatibleVersion=Denna version av Zoteros ordbehandlarplugin($INTEGRATION_VERSION) är inkompatibel med denna version av Zoteros Firefoxtillägg (%1$S). Kolla så du har senaste version av båda programmen.
+integration.error.incompatibleVersion=Denna version av Zoteros ordbehandlarplugin($INTEGRATION_VERSION) är inkompatibel med denna version av Zotero (%1$S). Kolla så du har senaste version av båda programmen.
 integration.error.incompatibleVersion2=Zotero %1$S behöver %2$S %3$S eller nyare. Ladda ner den senaste versionen av %2$S från zotero.org.
 integration.error.title=Zotero integreringsfel
-integration.error.notInstalled=Firefox kunde inte ladda en komponent som behövs för att kommunicera med ordbehandlaren. Kolla att rätt Firefoxtillägg är installerat och försök igen.
+integration.error.notInstalled=Zotero kunde inte ladda en komponent som behövs för att kommunicera med ordbehandlaren. Kolla att rätt tillägg är installerat och försök igen.
 integration.error.generic=Zotero råkade ut för ett fel när det uppdaterade ditt dokument.
 integration.error.mustInsertCitation=Du måste sätta in en källhänvisning innan du gör detta.
 integration.error.mustInsertBibliography=Du måste sätta in en källförteckning innan du gör detta.
@@ -643,14 +708,22 @@ integration.citationChanged=Du har ändrat den här källhänvisningen sedan den
 integration.citationChanged.description=Om du klickar "Ja" så förhindras Zotero att uppdatera denna citering om du lägger till fler källor, byter referensstil, eller ändrar referensen. Om du klickar "Nej" tas dina tidigare ändringar bort.
 integration.citationChanged.edit=Du har ändrat den här källhänvisningen sedan den skapades av Zotero. Om du redigerar den tas dina ändringar bort. Vill du fortsätta?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Installera referensstil "%1$S" från %2$S?
 styles.updateStyle=Uppdatera existerande referensstil "%1$S" med "%2$S" från %3$S?
 styles.installed=Referensstilen "%S" importerades med lyckat resultat.
 styles.installError=%S verkar inte vara en giltig mallfil.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S refererar till en ogiltig eller saknad CSL-file med %2$S som källa.
 styles.deleteStyle=Är du säker på att du vill ta bort referensstilen "%1$S"?
 styles.deleteStyles=Är du säker på att du vill ta bort de valda referensstilarna?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Avbryt synkronisering
 sync.openSyncPreferences=Öppna synkroniseringsval...
 sync.resetGroupAndSync=Återställ grupp och synkronisering
@@ -660,18 +733,55 @@ sync.remoteObject=Fjärrobjekt
 sync.mergedObject=Ihopsatt objekt
 
 sync.error.usernameNotSet=Användarnamn är inte valt
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Lösenord är inte valt
 sync.error.invalidLogin=Ogiltigt användarnamn eller lösenord
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Skriv ett lösenord.
-sync.error.loginManagerCorrupted1=Zotero kan inte komma åt din inloggningsinformation, antagligen p.g.a en trasig Firefox-loginhanterardatabas.
-sync.error.loginManagerCorrupted2=Stäng Firefox, gör en backup och radera signons.* från din Firefox-profil. Skriv in dina inloggningsuppgifter i synkroniseringsrutan under Zotero-val.
+sync.error.loginManagerCorrupted1=Zotero kan inte komma åt din inloggningsinformation, antagligen p.g.a en trasig %S-loginhanterardatabas.
+sync.error.loginManagerCorrupted2=Stäng %1$S, gör en backup och radera signons.* från din %2$S-profil. Skriv in dina inloggningsuppgifter i synkroniseringsrutan under Zotero-val.
 sync.error.syncInProgress=En synkroniseringsprocess är redan igång.
-sync.error.syncInProgress.wait=Vänta till den förra synkroniseringen är klar eller starta om Firefox.
+sync.error.syncInProgress.wait=Vänta till den förra synkroniseringen är klar eller starta om %S.
 sync.error.writeAccessLost=Du har inte längre skrivrättighet till Zoterogruppen '%S', och filer som du lagt till eller ändrat kan inte bli synkroniserade med servern.
 sync.error.groupWillBeReset=Om du fortsätter kommer din kopia av gruppen att bli återställd till det som finns på servern, och lokala ändringar på källor och filer kommer att försvinna.
 sync.error.copyChangedItems=Om du vill kopiera dina ändringar någon annanstans eller be gruppadministratören om skrivrättighet så avbryt synkroniseringen nu.
 sync.error.manualInterventionRequired=En automatisk synkronisering ledde till en konflikt som måste åtgärdas manuellt.
 sync.error.clickSyncIcon=Klicka på synkroniseringsikonen för att synkronisera manuellt.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Ännu inte synkroniserad
 sync.status.lastSync=Senaste synkronisering:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Laddar upp data till synkroniseringsservern
 sync.status.uploadAccepted=Uppladdningen accepterades \u2014 väntar på synkroniseringsservern
 sync.status.syncingFiles=Synkroniserar filer
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB återstår
 sync.storage.filesRemaining=%1$S/%2$S filer
 sync.storage.none=Inga
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Lokal fil
 sync.storage.remoteFile=Fjärrfil
 sync.storage.savedFile=Sparad fil
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Serverkonfiguration kontollerad
 sync.storage.fileSyncSetUp=Filsynkronisering är igång.
 sync.storage.openAccountSettings=Inställningar för öppet konto
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Kunde inte komma åt servern %S.
 sync.storage.error.permissionDeniedAtAddress=Du har inte tillåtelse att skapa en Zoterokatalog på följande adress:
 sync.storage.error.checkFileSyncSettings=Kolla dina filsynkroniseringsinställningar eller kontakta administratören på synkroniseringsservern.
 sync.storage.error.verificationFailed=%S verifikation misslyckades. Kontrollera dina filsynkroniseringsinställningar i synkroniseringsrutan under Zotero-val.
 sync.storage.error.fileNotCreated=Filen '%S' kunde inte skapas Zoteros 'storage' katalog.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Du har inte längre tillåtelse att redigera filer i Zoterogrouppen '%S', och filen du ändrat eller lagt till kan inte synkroniseras med servern.
 sync.storage.error.copyChangedItems=Om du vill kopiera dina ändringar någon annanstans,så avbryt synkroniseringen nu.
 sync.storage.error.fileUploadFailed=Filuppladdning misslyckades.
 sync.storage.error.directoryNotFound=Katalogen hittades inte
 sync.storage.error.doesNotExist=%S finns inte.
 sync.storage.error.createNow=Vill du skapa den nu?
-sync.storage.error.webdav.enterURL=Skriv in adressen till en WebDAV.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S är inte en giltig WebDAV-adress.
 sync.storage.error.webdav.invalidLogin=WebDAV-servern accepterar inte ditt användarnamn och lösenord.
 sync.storage.error.webdav.permissionDenied=Du har inte behörighet att komma åt %S på WebDAV-servern.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=Fel i SSL-förbindelsen när %S kon
 sync.storage.error.webdav.loadURLForMoreInfo=Surfa till din WebDAV-adress för mer information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Se dokumentationen för mer information om åsidosättande av certifikat.
 sync.storage.error.webdav.loadURL=Ladda WebDAV-adress
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Du har uppnått ditt tillåtna utrymme på Zotero File Storage. Några filer laddades inte upp. Övrig Zoterodata kommer att fortsätta synkroniseras med servern.
 sync.storage.error.zfs.personalQuotaReached2=Kolla dina kontoinställningar på zotero.org för andra sparval.
 sync.storage.error.zfs.groupQuotaReached1=Gruppen '%S' har uppnått sitt tillåtna utrymme på Zotero File Storage. Några filer laddades inte upp. Övrig Zoterodata kommer att fortsätta synkroniseras med servern.
 sync.storage.error.zfs.groupQuotaReached2=Gruppägaren kan öka gruppens sparutrymme via sparinställningar på zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Spara etikett
 sync.longTagFixer.saveTags=Spara etiketter
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Kunde inte läsa text från PDF.
 recognizePDF.noMatches=Ingen passande källa hittades.
 recognizePDF.fileNotFound=Filen hittades inte.
 recognizePDF.limit=Du har gjort för många sökningar. Försök igen om en stund.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Inläsningen av metadata är färdig.
 recognizePDF.close.label=Stäng
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Välj ett ställe där den formaterade filen kan sparas
 rtfScan.scannedFileSuffix=(Scannad)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Kontrollen misslyckades
 lookup.failure.description=Zotero kunde inte hitta något som passade detta registreringsnummer. Kolla registreringsnummret och försök igen.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Visa online
 locate.online.tooltip=Gå till källan online
diff --git a/chrome/locale/th-TH/zotero/about.dtd b/chrome/locale/th-TH/zotero/about.dtd
index 7f33ac8387..ba285ed177 100644
--- a/chrome/locale/th-TH/zotero/about.dtd
+++ b/chrome/locale/th-TH/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "ขอบคุณเป็นพิเศษ:">
 <!ENTITY zotero.about.close "ปิด">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "เกียรติยศและกิตติกรรมประกาศ">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/th-TH/zotero/preferences.dtd b/chrome/locale/th-TH/zotero/preferences.dtd
index 5b143a63d9..3221f2ff5b 100644
--- a/chrome/locale/th-TH/zotero/preferences.dtd
+++ b/chrome/locale/th-TH/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "ค่าโดยปริยาย:">
 <!ENTITY zotero.preferences.items "รายการ">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "ทั่วไป">
 
@@ -12,16 +13,16 @@
 <!ENTITY zotero.preferences.showIn.separateTab "แยกแท็บ">
 <!ENTITY zotero.preferences.showIn.appTab "แท็บโปรแกรม">
 <!ENTITY zotero.preferences.statusBarIcon "ไอคอนแถบสถานะ:">
-<!ENTITY zotero.preferences.statusBarIcon.none "ว่างเปล่า">
+<!ENTITY zotero.preferences.statusBarIcon.none "ไม่มี">
 <!ENTITY zotero.preferences.fontSize "ขนาดตัวอักษร:">
 <!ENTITY zotero.preferences.fontSize.small "เล็ก">
 <!ENTITY zotero.preferences.fontSize.medium "กลาง">
 <!ENTITY zotero.preferences.fontSize.large "ใหญ่">
 <!ENTITY zotero.preferences.fontSize.xlarge "ใหญ่พิเศษ">
-<!ENTITY zotero.preferences.fontSize.notes "ขนาดตัวอักษรของหมายเหตุ">
+<!ENTITY zotero.preferences.fontSize.notes "ขนาดตัวอักษรของข้อความ">
 
 <!ENTITY zotero.preferences.miscellaneous "อื่น ๆ">
-<!ENTITY zotero.preferences.autoUpdate "ตรวจสอบการอัพเดตอัตโนมัติ">
+<!ENTITY zotero.preferences.autoUpdate "ตรวจสอบการอัพเดตตัวช่วยแปลเว็บไซต์โดยอัตโนมัติ">
 <!ENTITY zotero.preferences.updateNow "อัพเดตเดี๋ยวนี้">
 <!ENTITY zotero.preferences.reportTranslationFailure "รายงานตัวช่วยแปลเว็บไซต์ใช้งานไม่ได้">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "ยินยอมให้ zotero.org ปรับปรุงข้อมูลตามเวอร์ชั่นปัจจุบันของ Zotero">
@@ -30,26 +31,26 @@
 <!ENTITY zotero.preferences.automaticSnapshots "เก็บภาพหน้าจอโดยอัตโนมัติเมื่อสร้างรายการจากหน้าเว็บ">
 <!ENTITY zotero.preferences.downloadAssociatedFiles "แนบไฟล์ PDF และไฟล์อื่นโดยอัตโนมัติเมื่อบันทึกรายการ">
 <!ENTITY zotero.preferences.automaticTags "สร้างแท็กด้วยคำสำคัญและหัวเรื่องโดยอัตโนมัติ">
-<!ENTITY zotero.preferences.trashAutoEmptyDaysPre "ล้างรายการที่เคยลบและเก็บไว้ในถังขยะนานกว่า">
+<!ENTITY zotero.preferences.trashAutoEmptyDaysPre "ล้างรายการที่เคยลบและเก็บไว้ในถังขยะนานกว่า ">
 <!ENTITY zotero.preferences.trashAutoEmptyDaysPost "วันที่แล้ว">
 
 <!ENTITY zotero.preferences.groups "กลุ่ม">
 <!ENTITY zotero.preferences.groups.whenCopyingInclude "เมื่อสำเนารายการระหว่างไลบรารี่ ให้รวมถึง:">
-<!ENTITY zotero.preferences.groups.childNotes "หมายเหตุรายการลูก">
+<!ENTITY zotero.preferences.groups.childNotes "ข้อความรายการลูก">
 <!ENTITY zotero.preferences.groups.childFiles "ภาพหน้าจอและแฟ้มที่นำเข้าของรายการลูก">
 <!ENTITY zotero.preferences.groups.childLinks "ลิงค์ลูก">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "แท็ก">
 
 <!ENTITY zotero.preferences.openurl.caption "URL แบบเปิด">
 
 <!ENTITY zotero.preferences.openurl.search "ค้นหาตัวแก้ปัญหา">
 <!ENTITY zotero.preferences.openurl.custom "กำหนดเอง">
-<!ENTITY zotero.preferences.openurl.server "ตัวแก้ปัญหา:">
+<!ENTITY zotero.preferences.openurl.server "ตัวแก้ปัญหา: ">
 <!ENTITY zotero.preferences.openurl.version "รุ่น:">
 
 <!ENTITY zotero.preferences.prefpane.sync "ประสานข้อมูล">
-<!ENTITY zotero.preferences.sync.username "ชื่อผู้ใช้:">
-<!ENTITY zotero.preferences.sync.password "รหัสผ่าน:">
+<!ENTITY zotero.preferences.sync.username "ชื่อผู้ใช้: ">
+<!ENTITY zotero.preferences.sync.password "รหัสผ่าน: ">
 <!ENTITY zotero.preferences.sync.syncServer "ประสานข้อมูลกับเครื่องบริการของ Zotero">
 <!ENTITY zotero.preferences.sync.createAccount "สร้างบัญชีผู้ใช้">
 <!ENTITY zotero.preferences.sync.lostPassword "รหัสผ่านหาย?">
@@ -57,11 +58,16 @@
 <!ENTITY zotero.preferences.sync.about "เกี่ยวกับการประสานข้อมูล">
 <!ENTITY zotero.preferences.sync.fileSyncing "ประสานข้อมูลในแฟ้ม">
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
-<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "ประสานข้อมูลในแฟ้มแนบในไลบรารี่โดยใช้">
+<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "ประสานข้อมูลในแฟ้มแนบในไลบรารี่โดยใช้ ">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "ประสานข้อมูลในแฟ้มแนบในกลุ่มไลบรารี่โดยใช้ที่เก็บของ Zotero">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "คุณยอมรับเงื่อนไขการใช้ที่เก็บของ Zotero">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "เงื่อนไขและข้อกำหนด">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "ประสานข้อมูลทั้งหมดกับเครื่องบริการของ Zotero">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "ผนวกข้อมูลในเครื่องด้วยข้อมูลจากเครื่องบริการโดยไม่สนใจประวัติการประสาน">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "เรียกคืนจากเครื่องบริการ Zotero">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "ล้างข้อมูลในเครื่องบริการ Zotero แล้วบันทึกทับด้วยข้อมูลจากเครื่องนี้">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "ตั้งค่าประวัติการประสานข้อมูลแฟ้มใหม่">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "ตรวจสอบข้อมูลบนเซิร์ฟเวอร์สำหรับไฟล์แนบทั้งหมดในเครื่อง">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "ตั้งค่าใหม่...">
 
 
@@ -114,13 +121,14 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "ชื่อเรื่อง">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "ปรับเป็นรุ่นปัจจุบันแล้ว">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "เลือกใช้รูปแบบเพิ่มเติม...">
 
 <!ENTITY zotero.preferences.prefpane.keys "คีย์ลัด">
 
 <!ENTITY zotero.preferences.keys.openZotero "เปิด/ปิดแผง Zotero">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "เปลี่ยนสู่แบบเต็มจอ">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "โฟกัสที่ช่องไลบรารี่">
 <!ENTITY zotero.preferences.keys.quicksearch "ค้นหาด่วน">
 <!ENTITY zotero.preferences.keys.newItem "สร้างรายการใหม่">
 <!ENTITY zotero.preferences.keys.newNote "สร้างหมายเหตุใหม่">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - คำใดๆ">
 
 <!ENTITY zotero.preferences.prefpane.advanced "ขั้นสูง">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "หาที่ตั้ง">
 <!ENTITY zotero.preferences.locate.locateEngineManager "ตัวจัดการเครื่องมือค้นหาบทความ">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "โปรดเลือก...">
 <!ENTITY zotero.preferences.dataDir.reveal "แสดงไดเรคทอรีข้อมูล">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "การบำรุงรักษาฐานข้อมูล">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "ตรวจสอบความถูกต้องของฐานข้อมูล">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "ตั้งค่าตัวช่วยแปลและรูปแบบอ้างอิงใหม่...">
diff --git a/chrome/locale/th-TH/zotero/standalone.dtd b/chrome/locale/th-TH/zotero/standalone.dtd
index ec120ca486..15f6237604 100644
--- a/chrome/locale/th-TH/zotero/standalone.dtd
+++ b/chrome/locale/th-TH/zotero/standalone.dtd
@@ -3,7 +3,7 @@
 <!ENTITY servicesMenuMac.label "บริการ">
 <!ENTITY hideThisAppCmdMac.label "ซ่อน &brandShortName;">
 <!ENTITY hideThisAppCmdMac.commandkey "H">
-<!ENTITY hideOtherAppsCmdMac.label "ซ่อน">
+<!ENTITY hideOtherAppsCmdMac.label "ซ่อนอื่น ๆ">
 <!ENTITY hideOtherAppsCmdMac.commandkey "H">
 <!ENTITY showAllAppsCmdMac.label "แสดงทั้งหมด">
 <!ENTITY quitApplicationCmdMac.label "ออกจาก Zotero">
@@ -12,12 +12,12 @@
 
 <!ENTITY fileMenu.label "แฟ้ม">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "บันทึก...">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
+<!ENTITY pageSetupCmd.label "ตั้งค่าหน้ากระดาษ...">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "พิมพ์...">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "U">
 <!ENTITY closeCmd.label "ปิด">
@@ -25,7 +25,7 @@
 <!ENTITY closeCmd.accesskey "C">
 <!ENTITY quitApplicationCmdWin.label "ออกจากโปรแกรม">
 <!ENTITY quitApplicationCmdWin.accesskey "x">
-<!ENTITY quitApplicationCmd.label "เลิก">
+<!ENTITY quitApplicationCmd.label "เลิกใช้">
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
@@ -97,5 +97,5 @@
 <!ENTITY helpFeedbackPage.accesskey "S">
 <!ENTITY helpReportErrors.label "รายงานความผิดพลาดให้ Zotero...">
 <!ENTITY helpReportErrors.accesskey "R">
-<!ENTITY helpCheckForUpdates.label "ตรวจสอบรุ่นปัจจุบัน...">
+<!ENTITY helpCheckForUpdates.label "ตรวจสอบรุ่นล่าสุด...">
 <!ENTITY helpCheckForUpdates.accesskey "U">
diff --git a/chrome/locale/th-TH/zotero/zotero.dtd b/chrome/locale/th-TH/zotero/zotero.dtd
index f9a5b28c6c..858489836f 100644
--- a/chrome/locale/th-TH/zotero/zotero.dtd
+++ b/chrome/locale/th-TH/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "แก้ไข">
 <!ENTITY zotero.general.delete "ลบ">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "บันทึกความผิดพลาดอาจรวมข้อความที่ไม่เกี่ยวกับ Zotero ไว้ด้วย">
 <!ENTITY zotero.errorReport.submissionInProgress "โปรดรอในระหว่างที่รายงานข้อผิดพลาดกำลังส่งอยู่">
 <!ENTITY zotero.errorReport.submitted "รายงานข้อผิดพลาดได้รับการส่งเรียบร้อยแล้ว">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "กรุณาลงประกาศข้อความในฟอรั่มของ Zotero (forums.zotero.org) โดยใช้รหัสรายงาน รายละเอียดของปัญหาและขั้นตอนที่ำทำให้เกิดปัญหานั้นอีก">
 <!ENTITY zotero.errorReport.notReviewed "Error reports are generally not reviewed unless referred to in the forums.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "ท่านได้ติดตั้ง Zotero รุ่นใหม่แล้ว">
 <!ENTITY zotero.upgrade.upgradeRequired "ฐานข้อมูล Zotero ของท่าน จำเป็นต้องปรับเป็นรุ่นปัจจุบันก่อนเพื่อให้ทำงานได้กับรุ่นใหม่">
 <!ENTITY zotero.upgrade.autoBackup "ฐานข้อมูลปัจจุบันของท่านจะได้รับการทำสำรองไว้โดยอัตโนมัติ ก่อนที่จะมีการเปลี่ยนแปลงใด ๆ เกิดขึ้น">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "สิทธิ์">
 <!ENTITY zotero.items.dateAdded_column "วันที่เพิ่ม">
 <!ENTITY zotero.items.dateModified_column "วันที่แก้ไข">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "แสดงในไลบรารี่">
 <!ENTITY zotero.items.menu.attach.note "เพิ่มหมายเหตุ">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "แปลงแบบอักษร">
 <!ENTITY zotero.item.textTransform.titlecase "แบบชื่อเรื่อง">
 <!ENTITY zotero.item.textTransform.sentencecase "แบบประโยค">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "หมายเหตุใหม่">
 <!ENTITY zotero.toolbar.note.standalone "หมายเหตุแบบสแตนด์อะโลนใหม่">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "เลือกตามที่เห็น">
 <!ENTITY zotero.tagSelector.clearVisible "ไม่เลือกตามที่เห็น">
 <!ENTITY zotero.tagSelector.clearAll "ไม่เลือกทั้งหมด">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "เปลี่ยนชื่อแท็ก...">
 <!ENTITY zotero.tagSelector.deleteTag "ลบแท็ก...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "ป้อน ISBN, DOI หรือ PMID ในกล่องด้านล่างนี้เพื่อค้นหา">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "เลือกรายการ">
 <!ENTITY zotero.selectitems.intro.label "เลือกรายการที่ต้องการเพิ่มเข้าไลบรารี่ของคุณ">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "แท็กที่ไม่ได้เลือกจะไม่ถูกบันทึก">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "แท็กจะถูกลบออกจากทุกรายการ">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "จดจำพร็อกซี่">
 <!ENTITY zotero.proxy.recognized.warning "เพียงเพิ่มพร็อกซี่เชื่อมโยงจากเว็บไซต์ห้องสมุด โรงเรียนหรือองค์กรของคุณ">
 <!ENTITY zotero.proxy.recognized.warning.secondary "การเพิ่มพร็อกซี่อื่น ๆ อาจทำให้เว็บที่มุ่งร้ายสวมรอยเป็นเว็บที่เชื่อถือของคุณได้">
diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties
index 60937df90b..3fa1beafa2 100644
--- a/chrome/locale/th-TH/zotero/zotero.properties
+++ b/chrome/locale/th-TH/zotero/zotero.properties
@@ -11,9 +11,12 @@ general.restartRequiredForChange=จำเป็นต้องปิดแล
 general.restartRequiredForChanges=จำเป็นต้องปิดและเรียกใช้ไฟล์ฟอกซ์ใหม่ เพื่อให้การเปลี่ยนแปลงมีผล
 general.restartNow=เริ่มใหม่เดี๋ยวนี้
 general.restartLater=เริ่มใหม่ทีหลัง
-general.restartApp=Restart %S
+general.restartApp=เริ่ม %S ใหม่
 general.errorHasOccurred=เกิดข้อผิดพลาด
 general.unknownErrorOccurred=พบความผิดพลาดที่ไม่ทราบที่มา
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=โปรดเริ่มไฟล์ฟอกซ์ใหม่
 general.restartFirefoxAndTryAgain=โปรดเริ่มไฟล์ฟอกซ์ใหม่และทดลองอีกครั้ง
 general.checkForUpdate=ตรวจสอบรุ่นใหม่
@@ -35,8 +38,12 @@ general.seeForMoreInformation=ดู %S สำหรับข้อมูลเ
 general.enable=ใช้งาน
 general.disable=ไม่ใช้งาน
 general.remove=ลบออก
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=เปิดการทำเอกสาร
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Zotero กำลังดำเนินการอยู่
 general.operationInProgress.waitUntilFinished=กรุณารอจนกว่าจะเสร็จ
@@ -68,6 +75,22 @@ errorReport.advanceMessage=กด %S เพื่อรายงานข้อ
 errorReport.stepsToReproduce=ขั้นตอนเพื่อที่จะทำให้เกิดขึ้นอีก:
 errorReport.expectedResult=ผลลัพธ์ที่คาดหวัง:
 errorReport.actualResult=ผลลัพธ์จริง:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=ไม่พบสารบบข้อมูลของ Zotero
 dataDir.previousDir=สารบบก่อนหน้า:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=ใช้สารบบเดียวกับโปร
 dataDir.selectDir=เลือกสารบบข้อมูลของ Zotero
 dataDir.selectedDirNonEmpty.title=สารบบมีข้อมูลอยู่
 dataDir.selectedDirNonEmpty.text=สารบบที่ท่านเลือกมีข้อมูลอยู่ และไม่ใช่ข้อมูลของ Zotero\n\nต้องการสร้างแฟ้มข้อมูลของ Zotero ในสารบบนี้แน่หรือ?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=พบการออกจากไลบรารี่ Zotero
 dataDir.standaloneMigration.description=คล้ายว่าคุณเพิ่งเริ่มใช้ %1$S. คุณต้องการให้ %1$S นำเข้าการตั้งค่าจาก %2$S และใช้สารบบที่มีอยู่แล้วของคุณหรือไม่?
 dataDir.standaloneMigration.multipleProfiles=%1$S จะแบ่งปันสารบบกับโพรไฟล์ที่ใช้อยู่เป็นประจำ
@@ -114,10 +141,11 @@ pane.collections.newSavedSeach=บันทึกผลการค้นหา
 pane.collections.savedSearchName=ใส่ชื่อสำหรับบันทึกผลการค้นหานี้
 pane.collections.rename=เปลี่ยนชื่อคอลเล็กชั่น:
 pane.collections.library=ไลบรารีของฉัน
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=ถังขยะ
 pane.collections.untitled=ยังไม่ตั้งชื่อเรื่อง
 pane.collections.unfiled=รายการที่ไม่จัดกลุ่ม
-pane.collections.duplicate=Duplicate Items
+pane.collections.duplicate=สร้างรายการที่เหมือนกัน
 
 pane.collections.menu.rename.collection=เปลี่ยนชื่อคอลเล็กชั่น...
 pane.collections.menu.edit.savedSearch=แก้ไขบันทึกผลการค้นหา
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=ท่านแน่ใจหรือว่า
 pane.tagSelector.numSelected.none=0 แท็กถูกเลือก
 pane.tagSelector.numSelected.singular=%S แท็กถูกเลือก
 pane.tagSelector.numSelected.plural=%S แท็กถูกเลือก
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=กำลังบรรจุรายการ...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=ย้ายลงถังขยะ
 pane.items.trash=คุณต้องการย้ายรายการที่เลือกไว้ลงถังขยะใช่หรือไม่?
 pane.items.trash.multiple=คุณต้องการย้ายรายการที่เลือกไว้ลงถังขยะใช่หรือไม่?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=เลือกไว้ %S รายการ
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=เปลี่ยนประเภทรายการ
 pane.item.changeType.text=คุณต้องการเปลี่ยนประเภทรายการใช่หรือไม่?\n\nฟีลด์ต่อไปนี้จะสูญหาย:
@@ -188,8 +227,8 @@ pane.item.defaultLastName=อันดับสุดท้าย
 pane.item.defaultFullName=ชื่อเต็ม
 pane.item.switchFieldMode.one=สลับเป็นเขตข้อมูลเดียว
 pane.item.switchFieldMode.two=สลับเป็นสองเขตข้อมูล
-pane.item.creator.moveUp=Move Up
-pane.item.creator.moveDown=Move Down
+pane.item.creator.moveUp=เลื่อนขึ้น
+pane.item.creator.moveDown=เลื่อนลง
 pane.item.notes.untitled=หมายเหตุไม่มีชื่อเรื่อง
 pane.item.notes.delete.confirm=คุณต้องการลบหมายเหตุนี้ใช่หรือไม่?
 pane.item.notes.count.zero=%S หมายเหตุ:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=แฟ้มแนบ %S แฟ้ม:
 pane.item.attachments.count.singular=แฟ้มแนบ %S แฟ้ม:
 pane.item.attachments.count.plural=แฟ้มแนบ %S แฟ้ม:
 pane.item.attachments.select=เลือกแฟ้มข้อมูล
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=คลิกที่นี่
-pane.item.tags=แท็กซ์:
 pane.item.tags.count.zero=%S แท็ก:
 pane.item.tags.count.singular=%S แท็ก:
 pane.item.tags.count.plural=%S แท็ก:
 pane.item.tags.icon.user=แท็กที่ผู้ใช้เพิ่ม
 pane.item.tags.icon.automatic=เพิ่มแท็กโดยอัตโนมัติ
-pane.item.related=สัมพันธ์กับ:
 pane.item.related.count.zero=%S สัมพันธ์กับ:
 pane.item.related.count.singular=%S สัมพันธ์กับ:
 pane.item.related.count.plural=%S สัมพันธ์กับ:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=คุณไม่สามารถเพ
 ingester.saveToZotero=บันทึกใน Zotero
 ingester.saveToZoteroUsing=บันทึกใน Zotero โดยใช้ "%S"
 ingester.scraping=Saving Item...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=รายการถูกบันทึกแล้ว
 ingester.scrapeError=ไม่สามารถบันทึกรายการได้
 ingester.scrapeErrorDescription=พบความผิดพลาดขณะบันทึกรายการนี้ รายละเอียดเพิ่มเติมดูได้จาก %S
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=อนุญาตที่ตั้ง
 
 ingester.importFile.title=นำเข้าแฟ้มข้อมูล
 ingester.importFile.text=คุณต้องการนำเข้าแฟ้ม "%S" ใช่หรือไม่?\n\nรายการจะถูกเพิ่มไปยังคอลเล็กชั่นใหม่
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=กำลังทำการค้นหา...
 ingester.lookup.error=พบความผิดพลาดขณะกำลังดำเนินการค้นหารายการนี้
@@ -441,20 +483,33 @@ db.dbRestoreFailed=ฐานข้อมูล Zotero '%S' เกิดการ
 db.integrityCheck.passed=ไม่พบความผิดพลาดในฐานข้อมุล
 db.integrityCheck.failed=พบความผิดพลาดในฐานข้อมูล Zotero
 db.integrityCheck.dbRepairTool=คุณสามารถใช้เครื่องมือซ่อมแซมฐานข้อมูลจาก http://zotero.org/utils/dbfix เพื่อพยายามแก้ไขความผิดพลาดเหล่านี้
-db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
-db.integrityCheck.appRestartNeeded=%S will need to be restarted.
-db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
-db.integrityCheck.errorsFixed=The errors in your Zotero database have been corrected.
-db.integrityCheck.errorsNotFixed=Zotero was unable to correct all the errors in your database.
-db.integrityCheck.reportInForums=You can report this problem in the Zotero Forums.
+db.integrityCheck.repairAttempt=Zotero สามารถหาทางแก้ไขความผิดพลาดเหล่านี้
+db.integrityCheck.appRestartNeeded=ต้องเริ่ม %S ใหม่
+db.integrityCheck.fixAndRestart=แก้ข้อผิดพลาดและเริ่ม %S ใหม่
+db.integrityCheck.errorsFixed=ข้อผิดพลาดในฐานข้อมูล Zotero ของคุณได้รับการแก้ไขแล้ว
+db.integrityCheck.errorsNotFixed=Zotero ไม่สามารถแก้ไขความผิดพลาดทั้งหมดของฐานข้อมูลได้
+db.integrityCheck.reportInForums=คุณสามารถรายงานปัญหานี้ไปยังฟอรั่มของ Zotero
 
 zotero.preferences.update.updated=ปรับเป็นรุ่นปัจจุบันแล้ว
 zotero.preferences.update.upToDate=ทันสมัย
 zotero.preferences.update.error=ความผิดพลาด
-zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when possible
+zotero.preferences.launchNonNativeFiles=เปิดไฟล์ PDFs และไฟล์่อื่นใน %S เมื่อเป็นไปได้
 zotero.preferences.openurl.resolversFound.zero=พบตัวแก้ปัญหา %S
 zotero.preferences.openurl.resolversFound.singular=พบตัวแก้ปัญหา %S
 zotero.preferences.openurl.resolversFound.plural=พบตัวแก้ปัญหา %S
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=สร้างดัชนีใหม่อีกครั้ง
 zotero.preferences.search.rebuildWarning=คุณต้องการสร้างดัชนีใหม่ทั้งหมดหรือไม่? อาจใช้เวลาสักครู่\n\nการทำดัชนีเฉพาะรายการที่ยังไม่ได้ทำให้ใช้ %S
 zotero.preferences.search.clearIndex=ล้างดัชนี
@@ -481,7 +536,7 @@ zotero.preferences.search.pdf.tryAgainOrViewManualInstructions=หลังจ
 zotero.preferences.export.quickCopy.bibStyles=รูปแบบบรรณานุกรม
 zotero.preferences.export.quickCopy.exportFormats=รูปแบบการส่งออก
 zotero.preferences.export.quickCopy.instructions=สำเนาแบบด่วนช่วยให้คุณสำเนาเอกสารอ้างอิงที่เลือกไปยังคลิปบอร์ดโดยใช้แป้นลัด (%S) หรือลากรายการไปยังกล่องข้อความบนหน้าเว็บ
-zotero.preferences.export.quickCopy.citationInstructions=For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
+zotero.preferences.export.quickCopy.citationInstructions=สำหรับบรรณานุกรม คุณสามารถสำเนาการอ้างอิงหรือเชิงอรรถโดยกด %S หรือกดแป้น Shift ค้างไว้ก่อนลากรายการ
 zotero.preferences.styles.addStyle=เพิ่มรูปแบบการอ้างอิง
 
 zotero.preferences.advanced.resetTranslatorsAndStyles=ตั้งค่าโปรแกรมแปลข้อมูลเมทาและรูปแบบการอ้างอิงใหม่
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=โปรแกรม
 zotero.preferences.advanced.resetStyles=ตั้งค่ารูปแบบการอ้างอิงใหม่อีกครั้ง
 zotero.preferences.advanced.resetStyles.changesLost=รูปแบบทั้งใหม่และที่เคยแก้ไขจะสูญหาย
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=แฟ้มต่อไปนี้มีอยู่แล้วในสารบบปลายทางและไม่ถูกสำเนา
 dragAndDrop.filesNotFound=แฟ้มต่อไปนี้หาไม่เจอและไม่สามารถสำเนาได้:
 
@@ -500,7 +559,8 @@ fileInterface.import=นำเข้า
 fileInterface.export=ส่งออก
 fileInterface.exportedItems=รายการที่ส่งออก
 fileInterface.imported=นำเข้าแล้ว
-fileInterface.fileFormatUnsupported=ไม่พบโปรแกรมแปลข้อมูลเมทาสำหรับแฟ้มที่ให้มา
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=บรรณานุกรมไม่มีชื่อเรื่อง
 fileInterface.bibliographyHTMLTitle=บรรณานุกรม
 fileInterface.importError=พบความผิดพลาดขณะพยายามนำเข้าแฟ้มที่เลือก โปรดตรวจสอบแฟ้มข้อมูลและลองอีกครั้ง
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=รายการที่คุณเลือ
 fileInterface.bibliographyGenerationError=พบความผิดพลาดการสร้างบรรณานุกรมของคุณ โปรดลองอีกครั้ง
 fileInterface.exportError=พบความผิดพลาดขณะพยายามส่งออกแฟ้มที่เลือก
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=ภาวะค้นหาขั้นสูง — กด Enter เพื่อค้นหา
 searchInProgress=กำลังค้นหา — โปรดรอสักครู่
 
@@ -556,7 +620,7 @@ fulltext.indexState.partial=บางส่วน
 
 exportOptions.exportNotes=ส่งออกหมายเหตุ
 exportOptions.exportFileData=ส่งออกแฟ้ม
-exportOptions.useJournalAbbreviation=Use Journal Abbreviation
+exportOptions.useJournalAbbreviation=ใช้ชื่อย่อวารสาร
 charset.UTF8withoutBOM=ยูนิโค้ด (UTF-8 ไม่มี BOM)
 charset.autoDetect=(ตรวจหาอัตโนมัติ)
 
@@ -572,8 +636,8 @@ citation.multipleSources=Multiple Sources...
 citation.singleSource=Single Source...
 citation.showEditor=แสดงโปรแกรมจัดการข้อมูล...
 citation.hideEditor=ซ่อนโปรแกรมจัดการข้อมูล...
-citation.citations=Citations
-citation.notes=Notes
+citation.citations=การอ้างอิง
+citation.notes=บันทึก
 
 report.title.default=รายงานของ Zotero
 report.parentItem=รายการแม่:
@@ -613,6 +677,7 @@ integration.cited.loading=กำลังบรรจุรายการที
 integration.ibid=ในที่เดียวกัน
 integration.emptyCitationWarning.title=การอ้างอิงว่างเปล่า
 integration.emptyCitationWarning.body=การอ้างอิงที่คุณกำหนดอาจว่างเปล่าในรูปแบบการอ้างอิงที่เลือกนี้ คุณต้องการเพิ่มใช่หรือไม่?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=ส่วนเสริม Zotero สำหรับโปรแกรมประมวลผลคำรุ่นนี้ ($INTEGRATION_VERSION) เข้ากันได้กับ Zotero รุ่นที่ติดตั้งขณะนี้ (%1$S) โปรดแน่ใจว่าคุณกำลังใช้รุ่นปัจจุบันทั้งสองส่วน
 integration.error.incompatibleVersion2=Zotero %1$S ต้องการ %2$S %3$S หรือใหม่กว่า กรุณาดาวน์โหลดรุ่นล่าสุดของ %2$S จาก zotero.org
@@ -643,14 +708,22 @@ integration.citationChanged=คุณแก้ไขการอ้างอิ
 integration.citationChanged.description=คลิก "ใช่" จะทำให้ Zotero ปรับการอ้างอิงนี้ให้เป็นปัจจุบันไม่ได้ถ้าคุณเพิ่มการอ้างอิง เปลี่ยนรูปแบบการอ้างอิงหรือแก้ไขเอกสารอ้างอิงของรายการที่อ้างถึง คลิก "ไม่ใช่" จะลบการแก้ไขของคุณทั้งหมด
 integration.citationChanged.edit=คุณได้แก้ไขการอ้างอิงนี้ตั้งแต่ Zotero สร้าง การแก้ไขนี้จะลบการปรับแก้ของคุณ คุณต้องการทำต่อหรือไม่?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=ติดตั้งรูปแบบการอ้างอิง "%1$S" จาก %2$S?
 styles.updateStyle=ปรับรูปแบบการอ้างอิง "%1$S" ให้เป็นปัจจุบันด้วย "%2$S" จาก %3$S?
 styles.installed=ติดตั้งรูปแบบการอ้างอิง "%S" เรียบร้อยแล้ว
 styles.installError=แฟ้มรูปแบบการอ้างอิง %S หาไม่พบ
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S อ้างอิงผิดหรือไม่มีแฟ้ม CSL ที่ %2$S อย่างแหล่งที่มา
 styles.deleteStyle=คุณแน่ใจหรือที่จะลบรูปแบบการอ้างอิง "%1$S"?
 styles.deleteStyles=คุณต้องการลบรูปแบบการอ้างอิงที่เลือกใช่หรือไม่
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=ยกเลิกการเชื่อมประสาน
 sync.openSyncPreferences=เปิดค่าตั้งพึงใจการเชื่อมประสาน...
 sync.resetGroupAndSync=ตั้งค่ากลุ่มและการเชื่อมประสานใหม่
@@ -660,8 +733,10 @@ sync.remoteObject=อ็อบเจกต์ทางไกล
 sync.mergedObject=รวมอ็อบเจกต์
 
 sync.error.usernameNotSet=ไม่ได้ตั้งชื่อผู้ใช้ั
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=ไม่ได้ตั้งรหัสผ่าน
 sync.error.invalidLogin=ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=โปรดใส่รหัสผ่าน
 sync.error.loginManagerCorrupted1=Zotero ไม่สามารถเข้าถึงข้อมูลบันทึกเข้า คล้ายว่าเนื่องจากการวิบัติของโปรแกรมจัดการฐานข้อมูลบันทึกเข้าของ %S
 sync.error.loginManagerCorrupted2=ปิด %S สำรองและลบ signons.* จากโพรไฟล์ของคุณใน %S และป้อนบันทึกเข้า Zotero ในแผงการเชื่อมประสานของค่าตั้งพึงใจใน Zotero อีกครั้ง
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=ถ้าคุณยังต้องการท
 sync.error.copyChangedItems=ถ้าคุณต้องการช่องทางสำหรับการสำเนาการเปลี่ยนแปลงที่อื่นหรือร้องขอสิทธิในการเขียนจากกลุ่มผู้บริหาร ให้ยกเลิกการเชื่อมประสานเดี๋ยวนี้
 sync.error.manualInterventionRequired=การเชื่อประสานอัตโนมัติเกิดการขัดแย้งซึ่งคุณต้องทำด้วยตัวเองแทน
 sync.error.clickSyncIcon=คลิกไอคอนเชื่อมประสานเพื่อเชื่อมประสานด้วยตนเอง
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=ยังไม่ได้เชื่อมประสาน
 sync.status.lastSync=เชื่อมประสานครั้งล่าสุด:
@@ -682,9 +792,12 @@ sync.status.uploadingData=กำลังปรับปรุงข้อมู
 sync.status.uploadAccepted=ยอมรับการอัพโหลด \u2014 กำลังรอจากเครื่องบริการ
 sync.status.syncingFiles=เชื่อมประสานแฟ้มข้อมูล
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB ยังคงอยู่
 sync.storage.filesRemaining=%1$S/%2$S แฟ้ม
 sync.storage.none=ไม่มี
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=แฟ้มที่เครื่องนี้
 sync.storage.remoteFile=แฟ้มระยะไกล
 sync.storage.savedFile=แฟ้มถูกบันทึกแล้ว
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=โครงแบบเครื่อ
 sync.storage.fileSyncSetUp=การเชื่อมประสานแฟ้มติดตั้งเรียบร้อย
 sync.storage.openAccountSettings=เปิดการตั้งค่าบัญชีผู้ใช้
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=เครื่องบริการ %S ไม่สามารถเข้าถึงได้
 sync.storage.error.permissionDeniedAtAddress=คุณไม่ได้รับอนุญาตให้สร้างสารบบ Zotero ในเลขที่อยู่ต่อไปนี้:
 sync.storage.error.checkFileSyncSettings=โปรดตรวจการตั้งค่าการเชื่อมประสานแฟ้มของคุณหรือติดต่อผู้บริหารเครื่องบริการของคุณ
 sync.storage.error.verificationFailed=%S ตรวจสอบล้มเหลว ตรวจสอบการตั้งค่าการเชื่อมประสานแฟ้มในแผงเชื่อมประสานของค่าตั้งพึงใจของ Zotero
 sync.storage.error.fileNotCreated=แฟ้มข้อมูล '%S' สร้างใน 'ที่เก็บ' สารบบ Zotero ไม่ได้
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=คุณไม่มีสิทธิสำหรับการแก้ไขในกลุ่ม Zotero '%S' และแฟ้มที่คุณเพิ่มหรือแก้ไขนั้นไม่สามารถเชื่อมประสานไปยังเครื่องบริการได้
 sync.storage.error.copyChangedItems=ถ้าคุณต้องการช่องทางสำหรับการสำเนาการเปลี่ยนแปลงที่อื่น ให้ยกเลิกการเชื่อมประสานเดี๋ยวนี้
 sync.storage.error.fileUploadFailed=อัพโหลดแฟ้มไม่ได้
 sync.storage.error.directoryNotFound=ไม่พบสารบบ
 sync.storage.error.doesNotExist=%S ไม่มี
 sync.storage.error.createNow=คุณต้องการสร้างตอนนี้ใช่หรือไม่?
-sync.storage.error.webdav.enterURL=โปรดป้อน WebDAV URL
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S ไม่ใช่ WebDAV URL ที่ถูกต้อง
 sync.storage.error.webdav.invalidLogin=เครื่องบริการ WebDAV ไม่ยอมรับชื่อผู้ใช้และรหัสผ่านที่คุณป้อน
 sync.storage.error.webdav.permissionDenied=คุณไม่ได้รับอนุญาตให้เข้าถึง %S บนเครื่องบริการ WebDAV
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=การติดต่อ SSL เ
 sync.storage.error.webdav.loadURLForMoreInfo=บรรจุ WebDAV URL ของคุณในเบราว์เซอร์สำหรับข้อมูลเพิ่มเติม
 sync.storage.error.webdav.seeCertOverrideDocumentation=สำหรับข้อมูลเพิ่มเติมดูใบรับรองยกเลิกเอกสาร
 sync.storage.error.webdav.loadURL=บรรจุ WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=โควตาพื้นที่เก็บข้อมูลของคุณใน Zotero เต็มแล้ว บางแฟ้มข้อมูลไม่ได้ถูกอัพโหลด ข้อมูล Zotero อื่นจะเชื่อมประสานไปยังเครื่องบริการต่อไป
 sync.storage.error.zfs.personalQuotaReached2=ดูการตั้งค่าบัญชีผู้ใช้ zotero.org ของคุณสำหรับตัวเลือกของหน่วยเก็บ
 sync.storage.error.zfs.groupQuotaReached1=โควตาพื้นที่เก็บข้อมูลในกลุ่ม '%S' เต็มแล้ว บางแฟ้มข้อมูลไม่ได้ถูกอัพโหลด ข้อมูล Zotero อื่นจะเชื่อมประสานไปยังเครื่องบริการต่อไป
 sync.storage.error.zfs.groupQuotaReached2=เจ้าของกลุ่มสามารถเพิ่มขนาดหน่วยเก็บของกลุ่มจากการตั้งค่าหน่วยเก็บบน zotero.org
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=บันทึกแท็ก
 sync.longTagFixer.saveTags=บันทึกแท็ก
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=อ่านข้อมูลจาก PDF ไม่
 recognizePDF.noMatches=ไม่พบเอกสารอ้างอิงที่ตรงกัน
 recognizePDF.fileNotFound=ไม่พบแฟ้มข้อมูล
 recognizePDF.limit=ข้อคำถามเกิน โปรดลองอีกครั้งภายหลัง
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=เรียกคืนข้อมูลเมทาเรียบร้อยแล้ว
 recognizePDF.close.label=ปิด
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=เลือกที่ตั้งสำหรับบันทึกแฟ้มที่จัดรูปแบบแล้ว
 rtfScan.scannedFileSuffix=(กราดตรวจแล้ว)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=การค้นหาล้มเหลว
 lookup.failure.description=Zotero ไม่สามารถค้นหาระเบียนตามตัวระบุที่ให้ไว้ โปรดตรวจสอบตัวระบุแล้วลองอีกครั้ง
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=ดูออนไลน์
 locate.online.tooltip=ไปยังรายการนี้บนออนไลน์
diff --git a/chrome/locale/tr-TR/zotero/about.dtd b/chrome/locale/tr-TR/zotero/about.dtd
index 192c702d00..714dbabb82 100644
--- a/chrome/locale/tr-TR/zotero/about.dtd
+++ b/chrome/locale/tr-TR/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Özel teşekkürler:">
 <!ENTITY zotero.about.close "Kapat">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Diğer Katılımcılar ve Teşekkürler">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/tr-TR/zotero/preferences.dtd b/chrome/locale/tr-TR/zotero/preferences.dtd
index cca39b83a3..72b4bcfe2d 100644
--- a/chrome/locale/tr-TR/zotero/preferences.dtd
+++ b/chrome/locale/tr-TR/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Varsayılan">
 <!ENTITY zotero.preferences.items "Eserler">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Genel">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Kitaplığımda kullanılan ekli dosyaları eşle">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Zotero deposunu kullanan kütüphane gruplarının ekli dosyalarını eşle">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Zotero depolamayı kullanarak bunları kabul edersiniz:">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "Şartlar ve Koşullar">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Zetoro Sunucu ile Tam Eşleme">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Eşleme geçmişini gözetmeksiniz, yerel Zotero verisini sunucudaki veri ile birleştir.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Zotero Sunucusundan İçeri Aktar">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Sunucudaki tüm verileri sil ve yerel Zotero verisini üzerine yaz.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Dosya Eşleme Geçmişini Sıfırla">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Tüm yerel eklenti dosyalar için depolama sunucusunun kontrolünü zorla.">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Sıfırla...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Başlık">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Güncelleştirilme">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Ek stiller indir...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Kısayol Tuşları">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Herhangi bir dizi">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Gelişmiş">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Yerini Belirle">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Makale Bakma Motoru Yöneticisi">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Seç...">
 <!ENTITY zotero.preferences.dataDir.reveal "Veri Dizinini Göster">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Veritabanı Bakımı">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Veritabanı Bütünlüğünü Kontrol et">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Çevirileri ve Stilleri Sıfırla">
diff --git a/chrome/locale/tr-TR/zotero/standalone.dtd b/chrome/locale/tr-TR/zotero/standalone.dtd
index b48ae80acb..362d3c915a 100644
--- a/chrome/locale/tr-TR/zotero/standalone.dtd
+++ b/chrome/locale/tr-TR/zotero/standalone.dtd
@@ -12,14 +12,14 @@
 
 <!ENTITY fileMenu.label "Dosya">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "Kaydet...">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
+<!ENTITY pageSetupCmd.label "Sayfa Ayarları..">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "Yazdır...">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Kapat">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
diff --git a/chrome/locale/tr-TR/zotero/zotero.dtd b/chrome/locale/tr-TR/zotero/zotero.dtd
index 9cf5c437cf..7215adde40 100644
--- a/chrome/locale/tr-TR/zotero/zotero.dtd
+++ b/chrome/locale/tr-TR/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Düzenle">
 <!ENTITY zotero.general.delete "Sil">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Hata kaydı Zotero ile ilgili olmayan iletileri de içerebilir.">
 <!ENTITY zotero.errorReport.submissionInProgress "Lütfen hata raporu gönderilene kadar bekleyiniz.">
 <!ENTITY zotero.errorReport.submitted "Hata raporu gönderilmiştir.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Lütfen bu Rapor ile ilgili olarak Zotero forumlarına ileti gönderiniz, ayrıca iletinizde sorunun bir tanımı ve sorunu oluşturan adımları da yazınız.">
 <!ENTITY zotero.errorReport.notReviewed "Genellikle hata raporları forumlara gönderilmediği sürece incelenmez.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Zotero'nun yeni bir sürümünü kurdunuz.">
 <!ENTITY zotero.upgrade.upgradeRequired "Zotero veri tabanınız yeni sürüm ile birlikte çalışabilmesi için yükseltilmesi gerekir.">
 <!ENTITY zotero.upgrade.autoBackup "Herhangi bir değişiklik yapılmadan önce varolan veri tabanınız otomatik olarak yedeklenecektir.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Telif">
 <!ENTITY zotero.items.dateAdded_column "Eklendiği Tarih">
 <!ENTITY zotero.items.dateModified_column "Değiştirildiği Tarih">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Kitaplıkta Göster">
 <!ENTITY zotero.items.menu.attach.note "Not Ekle">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Metni Dönüştür">
 <!ENTITY zotero.item.textTransform.titlecase "Başlık Biçimi">
 <!ENTITY zotero.item.textTransform.sentencecase "Cümle Biçimi">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "Yeni Not">
 <!ENTITY zotero.toolbar.note.standalone "Yeni Bağımsız Not">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Görülebileni Seç">
 <!ENTITY zotero.tagSelector.clearVisible "Gürülebileni Seçme">
 <!ENTITY zotero.tagSelector.clearAll "Hiçbirini Seçme">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Etiketi Yeniden Adlandır...">
 <!ENTITY zotero.tagSelector.deleteTag "Etiketi Sil...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "ISBN, DOI veya PMID'yi girerek aşağıdaki kutuda ara.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Eser Seç">
 <!ENTITY zotero.selectitems.intro.label "Kitaplığınıza eklemek istediğiniz eserleri seçiniz">
@@ -208,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Seçilmemiş etiketler kaydedilmeyecek.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "Etiket tüm eserlerden silinecek.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "Vekil Sunucu Onaylandı">
 <!ENTITY zotero.proxy.recognized.warning "Yalnızca kütüphane, okul veya kurumsal web siteniz tarafından bağlantı verilen vekil sunucuları ekleyiniz.">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Başka vekil sunucuların eklenmesi kötü niyetli sitelere onaylanan site izni verebilir.">
diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties
index 1557f8c629..4a24a2ec3a 100644
--- a/chrome/locale/tr-TR/zotero/zotero.properties
+++ b/chrome/locale/tr-TR/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Sonra yeniden başlat.
 general.restartApp=Restart %S
 general.errorHasOccurred=Bir hata meydana geldi.
 general.unknownErrorOccurred=Bilinmeyen bir hata oluştu.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Lütfen %S'i yeniden başlat.
 general.restartFirefoxAndTryAgain=Lütfen %S'i yeniden başlat ve tekrar dene.
 general.checkForUpdate=Güncelleme için kontrol et
@@ -35,8 +38,12 @@ general.seeForMoreInformation=Daha fazla bilgi için bakınız: %S
 general.enable=Seçilir Kıl:
 general.disable=Seçilemez Kıl
 general.remove=Kaldır
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Bilgilemeyi Aç
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Zotero işlemi çalışıyor.
 general.operationInProgress.waitUntilFinished=Lütfen bitene kadar bekleyiniz.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Zotero geliştiricilerine bir hata raporu göndermek
 errorReport.stepsToReproduce=Çoğaltmak için adımlar
 errorReport.expectedResult=Beklenen sonuç:
 errorReport.actualResult=Gerçek sonuç:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Zotero veri dizini bulunamıyor.
 dataDir.previousDir=Önceki dizin:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Firefox profil dizinini kullan
 dataDir.selectDir=Zotero veri dizini seç
 dataDir.selectedDirNonEmpty.title=Dizin Boş Değil
 dataDir.selectedDirNonEmpty.text=Seçtiğiniz dizin boş değil ve Zotero veri dizini olarak görülmüyor.\n\nHerşeye rağmen bu dizinde Zotero dosyalarını oluşturmak istermisiniz?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Varolan Zotero Kitaplığı Bulundu
 dataDir.standaloneMigration.description=Bu %1$S'yı ilk kullanımınız olarak gözüküyor. %1$S'ın ayarlarınızı %2$S'dan aktarmasını ve varolan veri dizininizi kullanmak istiyor musunuz?
 dataDir.standaloneMigration.multipleProfiles=%1$S veri dizinini en son kullanılmış olan profil ile paylaşacak.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Yeni Kaydedilen Arama
 pane.collections.savedSearchName=Bu kayıtlı arama için bir isim giriniz:
 pane.collections.rename=Dermeyi yeniden adlandır:
 pane.collections.library=Kitaplığım
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Çöp
 pane.collections.untitled=İsimsiz
 pane.collections.unfiled=Dosyalanmamış Eserler
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Bu konu tüm eserlerden kaldırılacatır.
 pane.tagSelector.numSelected.none=0 konu seçildi
 pane.tagSelector.numSelected.singular=%S konu seçildi
 pane.tagSelector.numSelected.plural=%S konu seçildi
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Eserlerin listesi yükleniyor...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Çöpe Gönder
 pane.items.trash=Seçili eseri çöpe göndermeyi istediğinize emin misiniz?
 pane.items.trash.multiple=Seçili eserleri çöpe göndermeyi istediğinize emin misiniz?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=%S Eser seçildi
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Eser tipini değiştir
 pane.item.changeType.text=Eser tipini değiştirmek istediğinize emin misiniz?\n\nAşağıdaki alanlar kaybedilecek:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S ek:
 pane.item.attachments.count.singular=%S ek:
 pane.item.attachments.count.plural=%S ek:
 pane.item.attachments.select=Bir Dosya Seç
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=buraya tıkla
-pane.item.tags=Konular:
 pane.item.tags.count.zero=%S konu:
 pane.item.tags.count.singular=%S konu:
 pane.item.tags.count.plural=%S konu:
 pane.item.tags.icon.user=Kullanıcının eklediği konu
 pane.item.tags.icon.automatic=Otomatik olarak eklenen konu
-pane.item.related=İlgili
 pane.item.related.count.zero=%S ilgili:
 pane.item.related.count.singular=%S ilgili:
 pane.item.related.count.plural=%S ilgili:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=Şu an seçili olan dermeye dosya ekleyeme
 ingester.saveToZotero=Zotero'ya Kaydet
 ingester.saveToZoteroUsing=Zotero'ya "%S"yı kullanarak kaydet
 ingester.scraping=Eser kaydediliyor...
+ingester.scrapingTo=Saving to
 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.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=Bu site için hep izin ver
 
 ingester.importFile.title=Dosyayı İçeri Aktar
 ingester.importFile.text="%S" dosyasını içeri aktarmak istiyor musunuz?\n\nEserler yeni bir dermeye eklenecektir.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Bakma Yapıyor...
 ingester.lookup.error=Bu eser için bir bakma yaparken bir hata oldu.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=%S resolver bulundu
 zotero.preferences.openurl.resolversFound.singular=%S rosolver bulundu
 zotero.preferences.openurl.resolversFound.plural=%S resolver bulundu
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Indeks'i tekrar oluştur
 zotero.preferences.search.rebuildWarning=Tüm indeksi tekrar oluşturmak istiyormusunuz? Bu işlem zaman alabilir.\n\nYalnızca indekslenmeyen eserleri indekslemek için, %S kullanınız.
 zotero.preferences.search.clearIndex=Indeksi Temizle
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Yeni veya değiştirilm
 zotero.preferences.advanced.resetStyles=Stilleri Sıfırla
 zotero.preferences.advanced.resetStyles.changesLost=Yeni veya değiştirilmiş stiller kaybolacak.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Aşağıdaki dosyalar hedef dizinde zaten varlar ve kopyalanmadılar:
 dragAndDrop.filesNotFound=Aşağıdaki dosyalar bulunamadı ve kopyalanamaz:
 
@@ -500,7 +559,8 @@ fileInterface.import=İçeri Aktar
 fileInterface.export=Dışarı Aktar
 fileInterface.exportedItems=Dışarı aktarılan eserler
 fileInterface.imported=İçeri aktarıldı
-fileInterface.fileFormatUnsupported=Verilen dosya için çevirmen bulunamadı
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Başlıksız Bibliyografya
 fileInterface.bibliographyHTMLTitle=Bibliyografya
 fileInterface.importError=Seçilen dosyayı içeri aktarırken bir hata oluştu. Lütfen dosyanın doğruluğunu kontrol ediniz ve tekrar deneyiniz.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Seçtiğiniz eserler hiçbir gönderme içermiyo
 fileInterface.bibliographyGenerationError=Bibliyografyanızı oluştururken bir hata oluştu. Lütfen tekrar deneyiniz.
 fileInterface.exportError=Seçili dosyayı dışarı aktarırken bir hata oluştu.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Gelişmiş arama kipi — arama için Enter'e basın.
 searchInProgress=Arama devam ediyor — lütfen bekleyiniz.
 
@@ -613,6 +677,7 @@ integration.cited.loading=Gönderme Yapılmış Eserleri Yüklüyor...
 integration.ibid=a.g.e.
 integration.emptyCitationWarning.title=Boş Gönderme
 integration.emptyCitationWarning.body=Mevcut seçili biçiminiz belirttiğiniz gönderme için boş olacaktır. Bunu eklemek istediğinize emin misiniz?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=Zotero'nun bu sürümünün kelime işlemci eklentisi ($INTEGRATION_VERSION) Zotero'un şu anki kurulu sürümün firefox eklentisi (%1$S) ile uyumlu değildir. Lütfen her iki bileşenin de en son sürümünü kullandığınızdan emin olunuz.
 integration.error.incompatibleVersion2=Zotero %1$S %2$S %3$S'i gerektirmektedir. Lütfen, %2$S'in en son sürümünü zotero.org adresinden indiriniz.
@@ -643,14 +708,22 @@ integration.citationChanged=Bu göndermeyi Zotero oluşturduktan sonra değişti
 integration.citationChanged.description="Evet"i tıklamak, yeni göndermeler eklemeniz, stil değiştirmeniz veya bu göndermenin kaynağını değiştirmeniz durumunda Zotero'nun göndermenizi güncellemesini engelleyecektir. "Hayır"ı tıklamak değişikliklerinizi silecektir.
 integration.citationChanged.edit=Bu göndermeyi Zotero oluşturduktan spnra değiştirmişsiniz. Yapılacak düzenlemeler tüm değişikliklerinizi yok edecektir. Devam etmek istiyor musunuz?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Sitil "%1$S" %2$S'den kurulsunmu?
 styles.updateStyle=Geçerli sitili "%1$S" %3$S den  "%2$S" e güncellensinmi?
 styles.installed=sitil "%S" başarılı olarak kuruldu.
 styles.installError=%S dosyası geçerli bir biçim dosyası olarak görülmüyor.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S, %2$S'de geçersiz olan ya da varolmayan bir CSL dosyasına kaynağı olarak atfediyor.
 styles.deleteStyle=Bu biçimi silmek istediğinize emin misiniz? "%1$S"?
 styles.deleteStyles=Seçili biçimleri silmek istediğinize emin misiniz?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Eşlemeyi İptal Et
 sync.openSyncPreferences=Eşleme Tercihlerini Aç...
 sync.resetGroupAndSync=Grubu Sıfırla ve Eşle
@@ -660,8 +733,10 @@ sync.remoteObject=Uzak Nesne
 sync.mergedObject=Nesneyi Birleştir
 
 sync.error.usernameNotSet=Kullanıcı adı yok
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Şifre yok
 sync.error.invalidLogin=Geçersiz kullanıcı veya şifre
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Lütfen bir şifre giriniz.
 sync.error.loginManagerCorrupted1=Zotero sizin giriş bilginize erişemiyor, belki Firefox giriş yönetimi veritabasın bozulmuştur.
 sync.error.loginManagerCorrupted2=Firefox'u kapatın, girişleri yedekleyin ve silin. Zotero Tercihlerinde Eşleme Panelinde ki Zotere giriş bilgisini tekrar giriniz.
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=Eğer devam ederseniz, sunucudaki grup kopyanız sı
 sync.error.copyChangedItems=Eğer değişiklikleri başka bir yere kopyalamak veya grup yöneticisinden yazma hakkı istiyorsanız, eşlemeyi şimdi iptal ediniz.
 sync.error.manualInterventionRequired=Otomatik eşleme bir çelişki ile sonuçlandı bu elle müdahaleyi gerektiriyor.
 sync.error.clickSyncIcon=Elle eşleme için eşleme simgesine tıklayın.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Henüz eşlenmedi
 sync.status.lastSync=Son eşleme:
@@ -682,9 +792,12 @@ sync.status.uploadingData=Veri eşleme sunucusuna yükleniyor
 sync.status.uploadAccepted=Yükleme kabul edildi -- eşleme sunucusu bekleniyor
 sync.status.syncingFiles=Eşlenen dosyalar
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB kaldı
 sync.storage.filesRemaining=%1$S/%2$S dosya
 sync.storage.none=Hiç
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Yerel Dosya
 sync.storage.remoteFile=Uzak Dosya
 sync.storage.savedFile=Kaydedilen Dosya
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=Sunucu yapılandırması onaylandı
 sync.storage.fileSyncSetUp=Dosya eşleme başarılı olarak kuruldu.
 sync.storage.openAccountSettings=Hesap Ayarlarını Aç
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=Bu sunucu %S ulaşılamaz.
 sync.storage.error.permissionDeniedAtAddress=Belirtilen adreste Zotero dizini yaratmak için izne sahip değilsiniz:
 sync.storage.error.checkFileSyncSettings=Lütfen, dosya eşleme ayarlarınızı kontrol ediniz veya sunucu yöneticinizle temas kurunuz.
 sync.storage.error.verificationFailed=%S onaylama başarısız. Zotero tercihlerinde, Eşleme panosundaki dosya eşleme ayarlarınızı doğrulayınız.
 sync.storage.error.fileNotCreated='%S' dosyası Zotero depo dizininde yaratılamadı.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=Zotero grup '%S' düzenleme hakkına sahip değilsiniz ve yaptığınız ekleme veya düzeltmeler sunucuya eşlenmeyecek.
 sync.storage.error.copyChangedItems=Eğer başkabiryerde değişen dosya ve eserlerin kopyalanmasını değiştirmek isterseniz, şimdi eşlemeyi iptal edin.
 sync.storage.error.fileUploadFailed=Dosya yükleme başarısız.
 sync.storage.error.directoryNotFound=Dizin bulunamadı
 sync.storage.error.doesNotExist=%S mevcut değil
 sync.storage.error.createNow=Şimdi yaratmak istiyor musunuz?
-sync.storage.error.webdav.enterURL=Lütfen WebDAV URL giriniz.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S geçerli bir WebDAV URL değildir.
 sync.storage.error.webdav.invalidLogin=WebDAV girdiğiniz kullanıcı ve şifreyi kabul etmiyor.
 sync.storage.error.webdav.permissionDenied=WebAV sunucusunda %S erişim iznine sahip değilsiniz.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=%S bağlanırken SSL bağlantı hat
 sync.storage.error.webdav.loadURLForMoreInfo=Daha fazla bilgi için WebDAV URL'nizi tarayıcıya yükleyin.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Daha çok bilgi için sertifika geçersiz kılma belgelemesini görünüz.
 sync.storage.error.webdav.loadURL=WebDAV URLsini Yükle
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=Zotero Dosya Depolama limitinizi ulaştı. Bazı dosyalar yüklenmeyecek. Diğer Zoter verisi ise eşlenmeye devam edecek.
 sync.storage.error.zfs.personalQuotaReached2=Daha fazla depolama seçenekleri için zotero.org hesap ayarlarınıza bakınız.
 sync.storage.error.zfs.groupQuotaReached1='%S' grubu zotero Dosya Saklama limitine ulaştı. Bazı dosyalar yüklenmeyecek. Diğer Zotero verileri eşlenmeye devam edecek.
 sync.storage.error.zfs.groupQuotaReached2=Grup sahibi zotero.org'daki saklama ayarları bölümünden grubun depolama kapasitesini arttırabilir.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Etiketi Kaydet
 sync.longTagFixer.saveTags=Etiketleri Kaydet
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=PDF'den metin okunamıyor.
 recognizePDF.noMatches=Uyan bir kaynak bulunamadı.
 recognizePDF.fileNotFound=Dosya bulunamadı.
 recognizePDF.limit=Sorgu sınırına ulaşıldı. Sonra tekrar deneyin.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Üstveri Alımı Tamamlandı.
 recognizePDF.close.label=Kapat
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Zengin Metin Biçimi (.rtf)
 rtfScan.saveTitle=Biçimlendirilmiş dosya için kaydedilecek yeri seçiniz.
 rtfScan.scannedFileSuffix=(Tarandı)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Arama Başarısız
 lookup.failure.description=Belirtilen tanımlayıcı için Zotero bir kayıt bulamadı. Lütfen tanımlayıcıyı kontrol edin ve tekrar deneyin.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=Çevrimiçi Gösteriniz
 locate.online.tooltip=Bu esere çevrimiçi gidiniz
diff --git a/chrome/locale/vi-VN/zotero/about.dtd b/chrome/locale/vi-VN/zotero/about.dtd
index ea1cb726be..2c63d25901 100644
--- a/chrome/locale/vi-VN/zotero/about.dtd
+++ b/chrome/locale/vi-VN/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "Xin gửi lời cảm ơn đặc biệt tới:">
 <!ENTITY zotero.about.close "Đóng">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/vi-VN/zotero/preferences.dtd b/chrome/locale/vi-VN/zotero/preferences.dtd
index 4cf21981ab..9d5d6cee48 100644
--- a/chrome/locale/vi-VN/zotero/preferences.dtd
+++ b/chrome/locale/vi-VN/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "Mặc định:">
 <!ENTITY zotero.preferences.items "items">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "Các tùy chọn chung">
 
@@ -59,9 +60,14 @@
 <!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.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.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.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.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">
@@ -70,6 +76,7 @@
 <!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 "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "Reset...">
 
 
@@ -114,6 +121,7 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Phím gõ tắt">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Any string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Nâng cao">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "Locate">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "Chọn...">
 <!ENTITY zotero.preferences.dataDir.reveal "Hiển thị Thư mục dữ liệu">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "Bảo dưỡng Cơ sở dữ liệu">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Kiểm tra Tính toàn vẹn của Cơ sở dữ liệu">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
diff --git a/chrome/locale/vi-VN/zotero/standalone.dtd b/chrome/locale/vi-VN/zotero/standalone.dtd
index f63a223052..e02c6a5a54 100644
--- a/chrome/locale/vi-VN/zotero/standalone.dtd
+++ b/chrome/locale/vi-VN/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
@@ -90,7 +90,7 @@
 <!ENTITY aboutProduct.label "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "Support and Documentation">
-<!ENTITY productHelp.accesskey "H">
+<!ENTITY productHelp.accesskey "D">
 <!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 <!ENTITY helpFeedbackPage.label "Submit Feedback…">
diff --git a/chrome/locale/vi-VN/zotero/zotero.dtd b/chrome/locale/vi-VN/zotero/zotero.dtd
index b37e091952..c6cbf0507c 100644
--- a/chrome/locale/vi-VN/zotero/zotero.dtd
+++ b/chrome/locale/vi-VN/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "Edit">
 <!ENTITY zotero.general.delete "Delete">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "Sổ nhật ký lỗi có thể chứa các thông báo lỗi không liên quan tới Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Xin vui lòng chờ trong khi báo cáo lỗi được gửi đi.">
 <!ENTITY zotero.errorReport.submitted "Báo cáo lỗi đã được gửi đi">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "Please post a message to the Zotero forums (forums.zotero.org) with this Report ID, a description of the problem, and any steps necessary to reproduce it.">
 <!ENTITY zotero.errorReport.notReviewed "Error reports are generally not reviewed unless referred to in the forums.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "Bạn đã cài đặt một phiên bản mới của Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "Cơ sở dữ liệu Zotero của bạn phải được nâng cấp để có thể làm việc với phiên bản mới.">
 <!ENTITY zotero.upgrade.autoBackup "Cơ sở dữ liệu hiện tại của bạn sẽ được sao lưu dự phòng một cách tự động trước khi có bất kỳ một thay dổi nào.">
@@ -56,6 +58,22 @@
 <!ENTITY zotero.items.rights_column "Quyền hạn">
 <!ENTITY zotero.items.dateAdded_column "Ngày tạo lập">
 <!ENTITY zotero.items.dateModified_column "Ngày thay đổi">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Hiển thị trong Thư viện">
 <!ENTITY zotero.items.menu.attach.note "Tạo một Ghi chép">
@@ -76,7 +94,7 @@
 <!ENTITY zotero.toolbar.newItem.label "Biểu ghi mới">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Khác">
 <!ENTITY zotero.toolbar.newItemFromPage.label "Tạo một Biểu ghi mới cho Trang hiện tại">
-<!ENTITY zotero.toolbar.lookup.label "Add Item by Identifier">
+<!ENTITY zotero.toolbar.lookup.label "Add Item(s) by Identifier">
 <!ENTITY zotero.toolbar.removeItem.label "Xóa biểu ghi...">
 <!ENTITY zotero.toolbar.newCollection.label "Bộ sưu tập mới...">
 <!ENTITY zotero.toolbar.newGroup "New Group...">
@@ -103,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "Biến đổi Văn bản">
 <!ENTITY zotero.item.textTransform.titlecase "Viết hoa đầu từ">
 <!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "New Note">
 <!ENTITY zotero.toolbar.note.standalone "Ghi chép Độc lập mới">
@@ -120,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "Chọn các thẻ nhìn thấy được">
 <!ENTITY zotero.tagSelector.clearVisible "Bỏ lựa chọn các thẻ nhìn thấy được">
 <!ENTITY zotero.tagSelector.clearAll "Bỏ tất cả lựa chọn">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "Đổi tên Thẻ...">
 <!ENTITY zotero.tagSelector.deleteTag "Xóa Thẻ...">
 
-<!ENTITY zotero.lookup.description "Enter the ISBN, DOI, or PMID to look up in the box below.">
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
+<!ENTITY zotero.lookup.description "Enter one or more ISBNs, DOIs, or PMIDs to look up in the box below.">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "Chọn các Biểu ghi">
 <!ENTITY zotero.selectitems.intro.label "Chọn những biểu ghi bạn muốn thêm vào thư viện của bạn">
@@ -208,6 +235,10 @@
 <!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.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!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/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties
index d1e15c2ee2..237fd996f9 100644
--- a/chrome/locale/vi-VN/zotero/zotero.properties
+++ b/chrome/locale/vi-VN/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=Khởi động lại sau
 general.restartApp=Restart %S
 general.errorHasOccurred=Đã xảy ra một lỗi.
 general.unknownErrorOccurred=An unknown error occurred.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Xin hãy khởi động lại Firefox.
 general.restartFirefoxAndTryAgain=Xin hãy khởi động lại Firefox và thử lại một lần nữa.
 general.checkForUpdate=Tìm bản bản cập nhật
@@ -35,8 +38,12 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=Open Documentation
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -57,7 +64,7 @@ upgrade.advanceMessage=Ấn %S để nâng cấp ngay bây giờ.
 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 %S to try the upgrade again.
+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...
@@ -68,6 +75,22 @@ errorReport.advanceMessage=Ấn %S để gửi một báo cáo lỗi cho các t
 errorReport.stepsToReproduce=Các bước để tái lập lỗi:
 errorReport.expectedResult=Kết quả mong đợi:
 errorReport.actualResult=Kết quả thực sự đã nhận được:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=Không thể tìm thấy thư mục dữ liệu của Zotero.
 dataDir.previousDir=Thư mục trước:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=Dùng thư mục profile của Firefox
 dataDir.selectDir=Chọn một thư mục dữ liệu cho Zotero
 dataDir.selectedDirNonEmpty.title=Thư mục đã có dữ liệu
 dataDir.selectedDirNonEmpty.text=Thư mục bạn chọn đã có dữ liệu, và nó có vẻ không phải là một thư mục dữ liệu của Zotero.\n\nBạn vẫn muốn tạo các tập tin của Zotero trong thư mục này phải không?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=Existing Zotero Library Found
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=Tìm kiếm Định sẵn Mới
 pane.collections.savedSearchName=Hãy đặt tên cho tìm kiếm định sẵn này
 pane.collections.rename=Đổi tên bộ sưu tập:
 pane.collections.library=Thư viện của Tôi
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=Trash
 pane.collections.untitled=Vô danh
 pane.collections.unfiled=Unfiled Items
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=Bạn có chắc bạn muốn xóa thẻ này kh
 pane.tagSelector.numSelected.none=Chọn 0 thẻ
 pane.tagSelector.numSelected.singular=Chọn %S thẻ
 pane.tagSelector.numSelected.plural=Chọn %S thẻ
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Tải danh sách các biểu ghi...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 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?
@@ -179,7 +213,12 @@ pane.item.selected.multiple=Chọn %S biểu ghi
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=Đổi Kiểu cho Biểu ghi
 pane.item.changeType.text=Bạn có chắc bạn muốn đổi kiểu cho biểu ghi này?\n\nCác trường dữ liệu sau sẽ bị mất:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S phần đính kèm:
 pane.item.attachments.count.singular=%S phần đính kèm:
 pane.item.attachments.count.plural=%S phần đính kèm:
 pane.item.attachments.select=Chọn một Tập tin
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=ấn vào đây
-pane.item.tags=Thẻ:
 pane.item.tags.count.zero=%S thẻ:
 pane.item.tags.count.singular=%S thẻ:
 pane.item.tags.count.plural=%S thẻ:
 pane.item.tags.icon.user=Thẻ tạo bởi người dùng
 pane.item.tags.icon.automatic=Thẻ tạo tự động bởi Zotero
-pane.item.related=Liên quan:
 pane.item.related.count.zero=%S biểu ghi liên quan:
 pane.item.related.count.singular=%S biểu ghi liên quan:
 pane.item.related.count.plural=%S biểu ghi liên quan:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=You cannot add files to the currently sele
 ingester.saveToZotero=Lưu vào Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
 ingester.scraping=Đang lưu giữ Biểu ghi...
+ingester.scrapingTo=Saving to
 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.
@@ -427,7 +468,8 @@ ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into
 ingester.importReferRISDialog.checkMsg=Always allow for this site
 
 ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?\n\nItems will be added to a new collection.
+ingester.importFile.text=Do you want to import the file "%S"?
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=Performing Lookup…
 ingester.lookup.error=An error occurred while performing lookup for this item.
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=Số resolver tìm thấy: %S
 zotero.preferences.openurl.resolversFound.singular=Số resolver tìm thấy: %S
 zotero.preferences.openurl.resolversFound.plural=Số resolver tìm thấy: %S
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=Tái tạo Chỉ mục
 zotero.preferences.search.rebuildWarning=Bạn có muốn tái tạo toàn bộ chỉ mục không? Việc này có thể mất khá nhiều thời gian.\n\nNếu bạn chỉ muốn tạo chỉ mục cho các biểu ghi hiện chưa có chỉ mục, hãy ấn vào %S.
 zotero.preferences.search.clearIndex=Xóa Chỉ mục
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=Any new or modified tra
 zotero.preferences.advanced.resetStyles=Reset Styles
 zotero.preferences.advanced.resetStyles.changesLost=Any new or modified styles will be lost.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=Các tập tin sau đã có ở trong thư mục đích, và do đó không được sao chép:
 dragAndDrop.filesNotFound=Các tập tin sau không tồn tại, và do đó không được sao chép:
 
@@ -500,7 +559,8 @@ fileInterface.import=Nhập khẩu
 fileInterface.export=Xuất khẩu
 fileInterface.exportedItems=Biểu ghi đã được Xuất khẩu
 fileInterface.imported=Đã được nhập khẩu
-fileInterface.fileFormatUnsupported=Không có bộ biến đổi thích hợp cho tập tin này.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=Thư tịch Vô danh
 fileInterface.bibliographyHTMLTitle=Thư tịch
 fileInterface.importError=Đã xảy ra một lỗi khi đang nhập khẩu tập tin lựa chọn. Xin hãy kiểm tra tính hợp lệ của tập tin và thử lại một lần nữa.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=Các biểu ghi bạn vừa chọn không chứa
 fileInterface.bibliographyGenerationError=Đã xảy ra một lỗi khi đang tạo thư tịch. Xin hãy thử lại.
 fileInterface.exportError=Đã xảy ra một lỗi trong khi đang xuất khẩu tập tin được chọn.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=Chế độ tìm kiếm nâng cao — ấn Enter để tìm kiếm.
 searchInProgress=Đang thực hiện tìm kiếm — Xin vui lòng chờ.
 
@@ -613,11 +677,12 @@ integration.cited.loading=Loading Cited Items…
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Blank Citation
 integration.emptyCitationWarning.body=The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title=Zotero Integration Error
-integration.error.notInstalled=Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
+integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
 integration.error.generic=Zotero experienced an error updating your document.
 integration.error.mustInsertCitation=You must insert a citation before performing this operation.
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
@@ -643,14 +708,22 @@ integration.citationChanged=You have modified this citation since Zotero generat
 integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=Cài đặt style "%1$S" từ %2$S?
 styles.updateStyle=Cập nhật style "%1$S" với "%2$S" từ %3$S?
 styles.installed=Style "%S" đã được cài đặt thành công.
-styles.installError=%S does not appear to be a valid style file.
+styles.installError="%S" is not a valid style file.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
 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?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=Cancel Sync
 sync.openSyncPreferences=Open Sync Preferences...
 sync.resetGroupAndSync=Reset Group and Sync
@@ -660,18 +733,55 @@ sync.remoteObject=Remote Object
 sync.mergedObject=Merged Object
 
 sync.error.usernameNotSet=Username not set
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=Password not set
 sync.error.invalidLogin=Invalid username or password
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 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 %S.
+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 '%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.error.manualInterventionRequired=Conflicts have suspended automatic syncing.
+sync.error.clickSyncIcon=Click the sync icon to resolve them.
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=Not yet synced
 sync.status.lastSync=Last sync:
@@ -682,9 +792,12 @@ 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.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB remaining
 sync.storage.filesRemaining=%1$S/%2$S files
 sync.storage.none=None
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=Local File
 sync.storage.remoteFile=Remote File
 sync.storage.savedFile=Saved File
@@ -692,17 +805,23 @@ sync.storage.serverConfigurationVerified=Server configuration verified
 sync.storage.fileSyncSetUp=File sync is successfully set up.
 sync.storage.openAccountSettings=Open Account Settings
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=The server %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=%S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences.
 sync.storage.error.fileNotCreated=The file '%S' could not be created in the Zotero 'storage' directory.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=You no longer have file editing access to the Zotero group '%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=%S does not exist.
 sync.storage.error.createNow=Do you want to create it now?
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
 sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
 sync.storage.error.zfs.groupQuotaReached1=The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.groupQuotaReached2=The group owner can increase the group's storage capacity from the storage settings section on zotero.org.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=Save Tag
 sync.longTagFixer.saveTags=Save Tags
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=Could not read text from PDF.
 recognizePDF.noMatches=No matching references found.
 recognizePDF.fileNotFound=File not found.
 recognizePDF.limit=Query limit reached. Try again later.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=Metadata Retrieval Complete.
 recognizePDF.close.label=Close
 
@@ -753,8 +880,21 @@ rtfScan.rtf=Rich Text Format (.rtf)
 rtfScan.saveTitle=Select a location in which to save the formatted file
 rtfScan.scannedFileSuffix=(Scanned)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=Lookup Failed
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=View Online
 locate.online.tooltip=Go to this item online
diff --git a/chrome/locale/zh-CN/zotero/about.dtd b/chrome/locale/zh-CN/zotero/about.dtd
index cdc153fde5..570d1c08c9 100644
--- a/chrome/locale/zh-CN/zotero/about.dtd
+++ b/chrome/locale/zh-CN/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "特别鸣谢:">
 <!ENTITY zotero.about.close "关闭">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "其它人员和致谢">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/zh-CN/zotero/preferences.dtd b/chrome/locale/zh-CN/zotero/preferences.dtd
index 853d147445..ad36ef7d45 100644
--- a/chrome/locale/zh-CN/zotero/preferences.dtd
+++ b/chrome/locale/zh-CN/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "默认:">
 <!ENTITY zotero.preferences.items "条目">
 <!ENTITY zotero.preferences.period ".">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "常规">
 
@@ -35,10 +36,10 @@
 
 <!ENTITY zotero.preferences.groups "群组">
 <!ENTITY zotero.preferences.groups.whenCopyingInclude "跨文献库复制条目时, 包括:">
-<!ENTITY zotero.preferences.groups.childNotes "子便签">
+<!ENTITY zotero.preferences.groups.childNotes "子笔记">
 <!ENTITY zotero.preferences.groups.childFiles "子网页截图和导入的文件">
 <!ENTITY zotero.preferences.groups.childLinks "子链接">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "标签">
 
 <!ENTITY zotero.preferences.openurl.caption "打开URL">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "同步文献库中的附件,使用:">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "使用 Zotero 云存储同步群组文献库中的附件">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "若使用 Zotero 云存储, 你接受它的">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "条款和条件">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "与 Zotero 服务器进行完整同步">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "将本地数据与同步服务器合并, 并忽略同步历史.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "从 Zotero 服务器恢复">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "删除服务器所有数据并用本地数据覆盖.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "重置文件同步历史">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "强制为本地所有附件进行存储服务器检查">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "重置...">
 
 
@@ -114,13 +121,14 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "标题">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "更新于">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "获取更多样式...">
 
 <!ENTITY zotero.preferences.prefpane.keys "快捷键">
 
 <!ENTITY zotero.preferences.keys.openZotero "开/关 Zotero 面板">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "切换全屏模式">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "聚焦文献库面板">
 <!ENTITY zotero.preferences.keys.quicksearch "快速搜索">
 <!ENTITY zotero.preferences.keys.newItem "新建条目">
 <!ENTITY zotero.preferences.keys.newNote "新建笔记">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - 任意字符串">
 
 <!ENTITY zotero.preferences.prefpane.advanced "高级">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "定位">
 <!ENTITY zotero.preferences.locate.locateEngineManager "文章检索引擎管理器">
@@ -168,11 +177,17 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "导出时显示字符编码选项">
 
 <!ENTITY zotero.preferences.dataDir "数据存储位置">
-<!ENTITY zotero.preferences.dataDir.useProfile "使用 Firefox 配置目录">
+<!ENTITY zotero.preferences.dataDir.useProfile "使用配置目录">
 <!ENTITY zotero.preferences.dataDir.custom "自定义:">
 <!ENTITY zotero.preferences.dataDir.choose "选择...">
 <!ENTITY zotero.preferences.dataDir.reveal "打开数据目录">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "数据库维护">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "数据库完整性检查">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "重设转换器和样式...">
diff --git a/chrome/locale/zh-CN/zotero/standalone.dtd b/chrome/locale/zh-CN/zotero/standalone.dtd
index b948ecdebe..c9bda7e5b3 100644
--- a/chrome/locale/zh-CN/zotero/standalone.dtd
+++ b/chrome/locale/zh-CN/zotero/standalone.dtd
@@ -12,12 +12,12 @@
 
 <!ENTITY fileMenu.label "文件">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "保存…">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
+<!ENTITY pageSetupCmd.label "页面设置…">
 <!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "打印…">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "U">
 <!ENTITY closeCmd.label "关闭">
diff --git a/chrome/locale/zh-CN/zotero/zotero.dtd b/chrome/locale/zh-CN/zotero/zotero.dtd
index a7b5720479..b56dfc239b 100644
--- a/chrome/locale/zh-CN/zotero/zotero.dtd
+++ b/chrome/locale/zh-CN/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "编辑">
 <!ENTITY zotero.general.delete "删除">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "错误日志里可能会包含一些与Zotero无关的信息.">
 <!ENTITY zotero.errorReport.submissionInProgress "正在提交错误报告, 请等待.">
 <!ENTITY zotero.errorReport.submitted "错误报告已经提交.">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "请到Zotero论坛(forums.zotero.org)发布新帖, 内容包括: 报告ID, 问题描述以任何必要的步骤以重现该问题.">
 <!ENTITY zotero.errorReport.notReviewed "除非在此论坛中提交，错误报告一般不会被看到.">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "您已经安装了一个新版本的Zotero.">
 <!ENTITY zotero.upgrade.upgradeRequired "为了使用这个新版本您必须升级您的数据库.">
 <!ENTITY zotero.upgrade.autoBackup "在任何实质性的改动前, 您已有的数据库会被自动备份.">
@@ -56,7 +58,22 @@
 <!ENTITY zotero.items.rights_column "版权">
 <!ENTITY zotero.items.dateAdded_column "添加日期">
 <!ENTITY zotero.items.dateModified_column "修改日期">
-<!ENTITY zotero.items.numChildren_column "+">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "在文献库中显示">
 <!ENTITY zotero.items.menu.attach.note "添加笔记">
@@ -69,10 +86,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "还原到文献库中">
 <!ENTITY zotero.items.menu.duplicateItem "复制选中的条目">
-<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+<!ENTITY zotero.items.menu.mergeItems "合并条目…">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
-<!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "选择作为主条目的条目版本.">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "选择需要保留的域, 防止被其它版本的域覆盖.">
 
 <!ENTITY zotero.toolbar.newItem.label "新建条目">
 <!ENTITY zotero.toolbar.moreItemTypes.label "更多">
@@ -104,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "格式变换">
 <!ENTITY zotero.item.textTransform.titlecase "标题大写">
 <!ENTITY zotero.item.textTransform.sentencecase "句首大写">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "新建笔记">
 <!ENTITY zotero.toolbar.note.standalone "新建独立笔记">
@@ -121,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "选择可见的">
 <!ENTITY zotero.tagSelector.clearVisible "取消可见的选择">
 <!ENTITY zotero.tagSelector.clearAll "取消全部选择">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "重命名标签...">
 <!ENTITY zotero.tagSelector.deleteTag "删除标签...">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "在下面方框中输入ISBN, DOI或PMID来检索文献">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "选择条目">
 <!ENTITY zotero.selectitems.intro.label "选择要添加至文献库的条目">
@@ -133,9 +159,9 @@
 
 <!ENTITY zotero.bibliography.title "创建文献目录">
 <!ENTITY zotero.bibliography.style.label "引文样式:">
-<!ENTITY zotero.bibliography.outputMode "Output Mode:">
-<!ENTITY zotero.bibliography.bibliography "Bibliography">
-<!ENTITY zotero.bibliography.outputMethod "Output Method:">
+<!ENTITY zotero.bibliography.outputMode "输出模式:">
+<!ENTITY zotero.bibliography.bibliography "文献目录">
+<!ENTITY zotero.bibliography.outputMethod "输出方法:">
 <!ENTITY zotero.bibliography.saveAsRTF.label "另存为 RTF">
 <!ENTITY zotero.bibliography.saveAsHTML.label "另存为 HTML">
 <!ENTITY zotero.bibliography.copyToClipboard.label "复制到剪贴板">
@@ -144,7 +170,7 @@
 <!ENTITY zotero.integration.docPrefs.title "文档首选项">
 <!ENTITY zotero.integration.addEditCitation.title "添加/编辑引文">
 <!ENTITY zotero.integration.editBibliography.title "编辑文献目录">
-<!ENTITY zotero.integration.quickFormatDialog.title "Quick Format Citation">
+<!ENTITY zotero.integration.quickFormatDialog.title "快速格式化引文">
 
 <!ENTITY zotero.progress.title "进度">
 
@@ -163,7 +189,7 @@
 <!ENTITY zotero.citation.suppressAuthor.label "简略作者">
 <!ENTITY zotero.citation.prefix.label "前缀:">
 <!ENTITY zotero.citation.suffix.label "后缀:">
-<!ENTITY zotero.citation.editorWarning.label "Warning: If you edit a citation in the editor it will no longer update to reflect changes in your database or the citation style.">
+<!ENTITY zotero.citation.editorWarning.label "警告: 如果你在编辑器中编辑引文, 引文将无法与数据库或引文样式同步更新.">
 
 <!ENTITY zotero.richText.italic.label "斜体">
 <!ENTITY zotero.richText.bold.label "粗体">
@@ -209,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "未勾选的标签将不会被保存.">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "所有条目中的标签将被删除.">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "代理确认">
 <!ENTITY zotero.proxy.recognized.warning "仅添加来自您的图书馆, 学校或公司的链接的代理">
 <!ENTITY zotero.proxy.recognized.warning.secondary "添加其他代理将增加恶意网站伪装成您信任的站点的风险.">
diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties
index 3b853fb657..a67c52af36 100644
--- a/chrome/locale/zh-CN/zotero/zotero.properties
+++ b/chrome/locale/zh-CN/zotero/zotero.properties
@@ -11,9 +11,12 @@ general.restartRequiredForChange=%S必须重启才能使变更生效.
 general.restartRequiredForChanges=%S必须重启才能使变更生效.
 general.restartNow=立即重启
 general.restartLater=稍后重启
-general.restartApp=Restart %S
+general.restartApp=重启 %S
 general.errorHasOccurred=发生了一个错误.
 general.unknownErrorOccurred=发生未知错误.
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=请重启%S.
 general.restartFirefoxAndTryAgain=请重启%S, 然后再试.
 general.checkForUpdate=检查更新
@@ -35,8 +38,12 @@ general.seeForMoreInformation=查看%S获取更多信息.
 general.enable=启用
 general.disable=禁用
 general.remove=移除
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=打开文档
-general.numMore=%S more…
+general.numMore=%S 更多…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=另一个 Zotero 操作正在进行.
 general.operationInProgress.waitUntilFinished=请耐心等待完成.
@@ -68,6 +75,22 @@ errorReport.advanceMessage=按 %S 给 Zotero 开发人员发送错误报告.
 errorReport.stepsToReproduce=用于重现的步骤:
 errorReport.expectedResult=预期结果:
 errorReport.actualResult=实际结果:
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=无法找到 Zotero 数据目录.
 dataDir.previousDir=上一目录:
@@ -75,6 +98,10 @@ dataDir.useProfileDir=使用 Firefox 配置目录
 dataDir.selectDir=选择 Zotero 数据目录
 dataDir.selectedDirNonEmpty.title=目录非空
 dataDir.selectedDirNonEmpty.text=您所选的目录非空, 且它并非 Zotero 数据目录.\n\n无论如何要在此目录里创建 Zotero 文件吗?
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=发现既有的 Zotero 库
 dataDir.standaloneMigration.description=这是您第一次使用%1$S. 您希望%1$S从%2$S导入设置并使用您已有的数据目录吗?
 dataDir.standaloneMigration.multipleProfiles=%1$S将与最近使用的配置共享数据目录.
@@ -114,10 +141,11 @@ pane.collections.newSavedSeach=新建检索
 pane.collections.savedSearchName=输入检索结果的名称:
 pane.collections.rename=重命名分类:
 pane.collections.library=我的文献库
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=回收站
 pane.collections.untitled=未命名
 pane.collections.unfiled=未分类条目
-pane.collections.duplicate=Duplicate Items
+pane.collections.duplicate=重复的条目
 
 pane.collections.menu.rename.collection=重命名分类...
 pane.collections.menu.edit.savedSearch=编辑搜索结果
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=您确定删除此标签吗?\n\n此标签将从
 pane.tagSelector.numSelected.none=选中 0 个标签
 pane.tagSelector.numSelected.singular=选中 %S 个标签
 pane.tagSelector.numSelected.plural=选中 %S 个标签
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=正在加载条目列表...
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=移动到回收站
 pane.items.trash=您确定要将选中的条目移动到回收站吗?
 pane.items.trash.multiple=您确定要将选中的条目移动到回收站吗?
@@ -176,10 +210,15 @@ pane.items.interview.manyParticipants=采访人 %S 等.
 
 pane.item.selected.zero=无选中的条目
 pane.item.selected.multiple=%S 条目被选中
-pane.item.unselected.zero=No items in this view
-pane.item.unselected.singular=%S item in this view
-pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+pane.item.unselected.zero=当前预览下无可用条目
+pane.item.unselected.singular=当前预览下有 %S 条目
+pane.item.unselected.plural=当前预览下有 %S 条目
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=更改条目类型
 pane.item.changeType.text=您确定要更改条目类型吗?\n\n如下字段将丢失:
@@ -188,8 +227,8 @@ pane.item.defaultLastName=姓
 pane.item.defaultFullName=全名
 pane.item.switchFieldMode.one=显示一个输入框
 pane.item.switchFieldMode.two=显示两个输入框
-pane.item.creator.moveUp=Move Up
-pane.item.creator.moveDown=Move Down
+pane.item.creator.moveUp=上移
+pane.item.creator.moveDown=下移
 pane.item.notes.untitled=未命名笔记
 pane.item.notes.delete.confirm=您确定要删除本条笔记吗?
 pane.item.notes.count.zero=%S 条笔记:
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S 个附件:
 pane.item.attachments.count.singular=%S 个附件:
 pane.item.attachments.count.plural=%S 个附件:
 pane.item.attachments.select=选择文件
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=点击此处
-pane.item.tags=标签:
 pane.item.tags.count.zero=%S 个标签:
 pane.item.tags.count.singular=%S 个标签:
 pane.item.tags.count.plural=%S 个标签:
 pane.item.tags.icon.user=用户添加的标签
 pane.item.tags.icon.automatic=自动添加的标签
-pane.item.related=相关:
 pane.item.related.count.zero=%S 个相关的:
 pane.item.related.count.singular=%S 个相关的:
 pane.item.related.count.plural=%S 个相关的:
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=您无法在当前选中的分类中添加
 ingester.saveToZotero=保存到Zotero
 ingester.saveToZoteroUsing=使用"%S"保存到 Zotero
 ingester.scraping=保存条目...
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=条目已存.
 ingester.scrapeError=无法保存条目
 ingester.scrapeErrorDescription=保存此条目时出错. 查看%S以获取更多信息.
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=总是允许该网址
 
 ingester.importFile.title=导入文件
 ingester.importFile.text=你要导入"%S"文件吗?\n\n条目将加入新的群组中.
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=执行检索...
 ingester.lookup.error=检索本条目时发生错误.
@@ -441,20 +483,33 @@ db.dbRestoreFailed=Zotero 数据库 '%S'似乎已损坏. 试图从最新的自
 db.integrityCheck.passed=没有在此数据库中发现错误.
 db.integrityCheck.failed=在 Zotero 数据库中发现错误!
 db.integrityCheck.dbRepairTool=你可以使用数据库修复工具来修复这些错误 http://zotero.org/utils/dbfix .
-db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
-db.integrityCheck.appRestartNeeded=%S will need to be restarted.
-db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
-db.integrityCheck.errorsFixed=The errors in your Zotero database have been corrected.
-db.integrityCheck.errorsNotFixed=Zotero was unable to correct all the errors in your database.
-db.integrityCheck.reportInForums=You can report this problem in the Zotero Forums.
+db.integrityCheck.repairAttempt=Zotero能够尝试更正这些错误.
+db.integrityCheck.appRestartNeeded=%S 需要重启.
+db.integrityCheck.fixAndRestart=修正错误并重启%S
+db.integrityCheck.errorsFixed=Zotero数据库的错误已经修复.
+db.integrityCheck.errorsNotFixed=Zotero无法修复数据库中的全部错误.
+db.integrityCheck.reportInForums=您可以在Zotero论坛中报告此问题.
 
 zotero.preferences.update.updated=已更新
 zotero.preferences.update.upToDate=已是最新版本
 zotero.preferences.update.error=错误
-zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when possible
+zotero.preferences.launchNonNativeFiles=优先尝试在 %S 中打开PDF文件或其它文件.
 zotero.preferences.openurl.resolversFound.zero=发现 %S 个解析器
 zotero.preferences.openurl.resolversFound.singular=发现 %S 个解析器
 zotero.preferences.openurl.resolversFound.plural=发现 %S 个解析器
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=重建索引
 zotero.preferences.search.rebuildWarning=是要重建整个索引吗? 这可能会花上一些时间.\n\n如果仅索引未索引的条目, 请用 %S.
 zotero.preferences.search.clearIndex=清除索引
@@ -480,8 +535,8 @@ zotero.preferences.search.pdf.toolsDownloadError=从 zotero.org 下载 %S 工具
 zotero.preferences.search.pdf.tryAgainOrViewManualInstructions=请稍后再试, 或参考手动安装说明文档
 zotero.preferences.export.quickCopy.bibStyles=文献目录样式
 zotero.preferences.export.quickCopy.exportFormats=导出格式
-zotero.preferences.export.quickCopy.instructions=快速复制可以让你通过按快捷键(%S)或拖放条目到网页上的文本框的方式将所选的参考文献复制到剪切板.
-zotero.preferences.export.quickCopy.citationInstructions=For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
+zotero.preferences.export.quickCopy.instructions=快速复制是通过快捷键%S将所选的条目复制到剪切板上或通过鼠标拖放将条目复制到网页上的文本框.
+zotero.preferences.export.quickCopy.citationInstructions=要复制文献的引用样式, 在复制引文或脚注前按快捷键%S或按住Shift键然后拖放条目.
 zotero.preferences.styles.addStyle=添加样式
 
 zotero.preferences.advanced.resetTranslatorsAndStyles=重置转换器和样式
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=所有新增的或修
 zotero.preferences.advanced.resetStyles=重设样式
 zotero.preferences.advanced.resetStyles.changesLost=所有新增的或修改过的样式都将丢失.
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=下列文件因已在目标文件夹中, 所以不会被复制:
 dragAndDrop.filesNotFound=未找到下列文件, 无法复制.
 
@@ -500,7 +559,8 @@ fileInterface.import=导入
 fileInterface.export=导出
 fileInterface.exportedItems=导出的条目
 fileInterface.imported=导入
-fileInterface.fileFormatUnsupported=指定文件无可用的转换器.
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=未命名文献目录
 fileInterface.bibliographyHTMLTitle=文献目录
 fileInterface.importError=试图导入所选文件时发生错误. 请确保此文件有效, 然后再试一次.
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=所选条目中不包含任何文献. 请选择
 fileInterface.bibliographyGenerationError=生成文献目录时出错. 请重试.
 fileInterface.exportError=试图导出所选文件出错.
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=高级检索模式 — 按回车键开始搜索.
 searchInProgress=正在检索 — 请稍候.
 
@@ -556,7 +620,7 @@ fulltext.indexState.partial=部分
 
 exportOptions.exportNotes=导出笔记
 exportOptions.exportFileData=导出文件
-exportOptions.useJournalAbbreviation=Use Journal Abbreviation
+exportOptions.useJournalAbbreviation=使用简写的期刊名
 charset.UTF8withoutBOM=Unicode (UTF-8 without BOM)
 charset.autoDetect=(自动检测)
 
@@ -572,8 +636,8 @@ citation.multipleSources=多重来源...
 citation.singleSource=单一来源...
 citation.showEditor=显示编辑器...
 citation.hideEditor=隐藏编辑器...
-citation.citations=Citations
-citation.notes=Notes
+citation.citations=引文
+citation.notes=笔记
 
 report.title.default=Zotero 报告
 report.parentItem=父条目:
@@ -613,6 +677,7 @@ integration.cited.loading=正在加载引用的条目...
 integration.ibid=同上
 integration.emptyCitationWarning.title=空白引用
 integration.emptyCitationWarning.body=你指定的引文在当前的样式下为空白, 您确定要添加吗?
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=此版本的 Zotero word 插件 ($INTEGRATION_VERSION) 与当前安装的 Zotero Firefox 扩展 (%1$S)不兼容. 请确保您所使用的两个组件均为最新版本.
 integration.error.incompatibleVersion2=Zotero %1$S 要求 %2$S %3$S 或更新. 请从 zotero.org 下载最新的版本的%2$S.
@@ -643,14 +708,22 @@ integration.citationChanged=在 Zotero 创建此引文后, 您做了修改. 您
 integration.citationChanged.description=点击“确定”将在您添加了其它的引文，更换样式或修改了它所指向的参考文献时, 防止 Zotero 更新该引文, 点击“取消”将删除你的变更.
 integration.citationChanged.edit=在 Zotero 创建此引文后, 您做了修改. 编辑操作将清除您的变更. 您确定要继续吗?
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=要从%2$S安装样式"%1$S"吗?
 styles.updateStyle=要从 %3$S用"%2$S"更新现有的样式 "%1$S"吗?
 styles.installed=样式"%S"已成功安装.
 styles.installError=%S 不是有效的样式文件.
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S 在%2$S中引用了无效的或不存在的CSL文件作为它的代码.
 styles.deleteStyle=您确定要删除样式"%1$S"吗?
 styles.deleteStyles=您确定要删除选中的样式吗?
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=取消同步
 sync.openSyncPreferences=打开同步首选项...
 sync.resetGroupAndSync=重新设置群组和同步
@@ -660,8 +733,10 @@ sync.remoteObject=远程对象
 sync.mergedObject=合并的对象
 
 sync.error.usernameNotSet=用户名未设置
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=密码未设置
 sync.error.invalidLogin=无效的用户名或密码
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=请输入密码
 sync.error.loginManagerCorrupted1=无法获取您的登录信息, 这可能是由于%S登录管理数据库损坏.
 sync.error.loginManagerCorrupted2=关闭%S, 备份并从%S配置文件中删除signons.*, 然后在 Zotero 首选项的同步面板中重新输入登录信息. 
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=如果您继续, 您所拥有的该群组的副本
 sync.error.copyChangedItems=如果您想要将您的变更拷贝到其它地方或请求群组管理员授予您写入权限, 请现在取消同步.
 sync.error.manualInterventionRequired=自动同步遇到冲突, 需要手动干预.
 sync.error.clickSyncIcon=点击同步图标进行手动同步
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=尚未同步
 sync.status.lastSync=上一次同步
@@ -682,9 +792,12 @@ sync.status.uploadingData=正在上传数据到同步服务器
 sync.status.uploadAccepted=等待同步服务器接受上传 \u2014
 sync.status.syncingFiles=正在同步文件
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=还剩%SKB
 sync.storage.filesRemaining=%1$S/%2$S 个文件
 sync.storage.none=无
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=本地文件
 sync.storage.remoteFile=远程文件
 sync.storage.savedFile=保存的文件
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=服务器设置验证通过
 sync.storage.fileSyncSetUp=文件同步设定成功
 sync.storage.openAccountSettings=打开帐户设置
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=无法连接服务器%S
 sync.storage.error.permissionDeniedAtAddress=您没有权限在下列地址创建 Zotero 目录:
 sync.storage.error.checkFileSyncSettings=请检查文件同步设置或联系您的服务器管理员.
 sync.storage.error.verificationFailed=%S 验证失败. 检查 Zotero 首选项中同步选项卡里的文件同步设置.
 sync.storage.error.fileNotCreated=不能在 'storage' 文件夹中创建 '%S' 文件.
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=您在 Zotero '%S' 群组中的文件编辑权限已被吊销; 您新增或编辑过的文件不能同步到服务器上.
 sync.storage.error.copyChangedItems=如果您要将变更的条目及文件拷贝到其它地方, 请现在取消同步.
 sync.storage.error.fileUploadFailed=文件上传失败.
 sync.storage.error.directoryNotFound=目录未找到
 sync.storage.error.doesNotExist=%S 不存在.
 sync.storage.error.createNow=你现在要创建吗?
-sync.storage.error.webdav.enterURL=请输入一个 WebDAV URL地址.
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S 不是有效的 WebDAV URL 地址.
 sync.storage.error.webdav.invalidLogin=WebDAV 服务器不接受您输入的用户名及密码.
 sync.storage.error.webdav.permissionDenied=您在 WebDAV 服务器上没有访问 %S 的权限.
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=连接至%S的SSL连接错误
 sync.storage.error.webdav.loadURLForMoreInfo=在浏览中加载 WebDAV URL 获取更多的信息
 sync.storage.error.webdav.seeCertOverrideDocumentation=浏览证书重载文档以获取更多的信息
 sync.storage.error.webdav.loadURL=加载 WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=您的 Zotero 文件存储配额已经达到, 有些文件将不能上传. Zotero 的其它数据将继续同步到 Zotero 服务器.
 sync.storage.error.zfs.personalQuotaReached2=在 zotero.org 的帐户设置里查看更多的存储选项.
 sync.storage.error.zfs.groupQuotaReached1=群组 '%S' 的 Zotero 文件存储的配额已经达到. 有些文件将不能上传. Zotero 的其它数据将继续同步到Zotero服务器.
 sync.storage.error.zfs.groupQuotaReached2=群组所有人可以在 zotero.org 里的存储设置里增加群组的存储容量.
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=保存标签
 sync.longTagFixer.saveTags=保存标签
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=无法从PDF中读取文本.
 recognizePDF.noMatches=未找到匹配的参考文献.
 recognizePDF.fileNotFound=文件未找到.
 recognizePDF.limit=达到请求上限. 请稍候再试.
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=元数据抓取完成.
 recognizePDF.close.label=关闭
 
@@ -753,8 +880,21 @@ rtfScan.rtf=富文本格式 (.rtf)
 rtfScan.saveTitle=选择保存格式化文件的存储位置
 rtfScan.scannedFileSuffix=(已扫描)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=检索失败
 lookup.failure.description=Zotero 无法找到指定标识符的记录. 请检查标识符, 然后再试.
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=在线查看
 locate.online.tooltip=在线查看该条目
diff --git a/chrome/locale/zh-TW/zotero/about.dtd b/chrome/locale/zh-TW/zotero/about.dtd
index 77fab05625..161e371486 100644
--- a/chrome/locale/zh-TW/zotero/about.dtd
+++ b/chrome/locale/zh-TW/zotero/about.dtd
@@ -10,3 +10,4 @@
 <!ENTITY zotero.thanks "特別感謝：">
 <!ENTITY zotero.about.close "關閉">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "更多功勞及感謝">
+<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
diff --git a/chrome/locale/zh-TW/zotero/preferences.dtd b/chrome/locale/zh-TW/zotero/preferences.dtd
index fa7431d969..9bcfcf2978 100644
--- a/chrome/locale/zh-TW/zotero/preferences.dtd
+++ b/chrome/locale/zh-TW/zotero/preferences.dtd
@@ -3,6 +3,7 @@
 <!ENTITY zotero.preferences.default "預設：">
 <!ENTITY zotero.preferences.items "項目">
 <!ENTITY zotero.preferences.period "。">
+<!ENTITY zotero.preferences.settings "Settings">
 
 <!ENTITY zotero.preferences.prefpane.general "一般">
 
@@ -38,7 +39,7 @@
 <!ENTITY zotero.preferences.groups.childNotes "子筆記">
 <!ENTITY zotero.preferences.groups.childFiles "子快照與匯入的檔案">
 <!ENTITY zotero.preferences.groups.childLinks "子鏈結">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "標簽">
 
 <!ENTITY zotero.preferences.openurl.caption "開啟網址">
 
@@ -59,9 +60,14 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "同步「我的圖書館」中的附加檔案時，採用">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "使用 Zotero storage 時，將圖書館中的附加檔案同步">
-<!ENTITY zotero.preferences.sync.fileSyncing.about "About File Syncing">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "使用 Zotero storage，您同意被它的">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "條款與條件 (terms and conditions) 所束縳">
+<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
+<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "與 Zotero 伺服器完全同步">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "將本機的 Zotero 資料與來自同步伺服器的資料合併，忽略同步歷史。">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "從 Zotero 伺服器回復">
@@ -70,6 +76,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "刪除所有伺服器上的資料，並以本機的 Zotero 資料覆蓋過去。">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "重設檔案同步歷史">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "強制檢查儲存伺服器上所有本機附加的檔案">
+<!ENTITY zotero.preferences.sync.reset "Reset">
 <!ENTITY zotero.preferences.sync.reset.button "重設……">
 
 
@@ -114,13 +121,14 @@
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "標題">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "已更新">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "文獻樣式語言CSL">
+<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "獲取額外的樣式…">
 
 <!ENTITY zotero.preferences.prefpane.keys "快速鍵">
 
 <!ENTITY zotero.preferences.keys.openZotero "開／關 Zotero 窗格">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "切換全螢幕模式">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "聚焦到書庫窗格">
 <!ENTITY zotero.preferences.keys.quicksearch "快速搜尋">
 <!ENTITY zotero.preferences.keys.newItem "建立一個新的項目">
 <!ENTITY zotero.preferences.keys.newNote "建立一則新的筆記">
@@ -154,6 +162,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - 任何字串">
 
 <!ENTITY zotero.preferences.prefpane.advanced "進階">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
 
 <!ENTITY zotero.preferences.prefpane.locate "查詢">
 <!ENTITY zotero.preferences.locate.locateEngineManager "論文查詢引擎管理器">
@@ -173,6 +182,12 @@
 <!ENTITY zotero.preferences.dataDir.choose "選擇…">
 <!ENTITY zotero.preferences.dataDir.reveal "顯示資料目錄">
 
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+
 <!ENTITY zotero.preferences.dbMaintenance "資料庫維修">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "檢查資料庫完整性">
 <!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "重設轉譯器與樣式…">
diff --git a/chrome/locale/zh-TW/zotero/standalone.dtd b/chrome/locale/zh-TW/zotero/standalone.dtd
index 8eaed3cc94..8074515c8a 100644
--- a/chrome/locale/zh-TW/zotero/standalone.dtd
+++ b/chrome/locale/zh-TW/zotero/standalone.dtd
@@ -19,7 +19,7 @@
 <!ENTITY pageSetupCmd.accesskey "U">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "U">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY closeCmd.label "關閉">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
diff --git a/chrome/locale/zh-TW/zotero/zotero.dtd b/chrome/locale/zh-TW/zotero/zotero.dtd
index 1ff4fa05f6..98ca6877d6 100644
--- a/chrome/locale/zh-TW/zotero/zotero.dtd
+++ b/chrome/locale/zh-TW/zotero/zotero.dtd
@@ -5,6 +5,7 @@
 <!ENTITY zotero.general.edit "編輯">
 <!ENTITY zotero.general.delete "刪除">
 
+<!ENTITY zotero.errorReport.title "Zotero Error Report">
 <!ENTITY zotero.errorReport.unrelatedMessages "錯誤記錄可能包括了一些和 Zotero 不相關的訊息。">
 <!ENTITY zotero.errorReport.submissionInProgress "請等候錯誤報告送出。">
 <!ENTITY zotero.errorReport.submitted "錯誤報告已經送出。">
@@ -12,6 +13,7 @@
 <!ENTITY zotero.errorReport.postToForums "請在 Zotero 論壇 (forums.zotero.org) 上張貼一個含有這個報告識別號、問題的描述、及任何產生問題的必要步驟的訊息。">
 <!ENTITY zotero.errorReport.notReviewed "一般來說，除非在論壇上有提到，錯誤報告是不會受到檢閱的。">
 
+<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
 <!ENTITY zotero.upgrade.newVersionInstalled "你已安裝了新版的 Zotero。">
 <!ENTITY zotero.upgrade.upgradeRequired "你的 Zotero 資料庫必須升級才能在新版本中使用。">
 <!ENTITY zotero.upgrade.autoBackup "在做出任何改變前，會自動備份你現存的資料庫。">
@@ -56,7 +58,22 @@
 <!ENTITY zotero.items.rights_column "權利">
 <!ENTITY zotero.items.dateAdded_column "加入日期">
 <!ENTITY zotero.items.dateModified_column "修改日期">
-<!ENTITY zotero.items.numChildren_column "+">
+<!ENTITY zotero.items.extra_column "Extra">
+<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
+<!ENTITY zotero.items.place_column "Place">
+<!ENTITY zotero.items.volume_column "Volume">
+<!ENTITY zotero.items.edition_column "Edition">
+<!ENTITY zotero.items.pages_column "Pages">
+<!ENTITY zotero.items.issue_column "Issue">
+<!ENTITY zotero.items.series_column "Series">
+<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.court_column "Court">
+<!ENTITY zotero.items.medium_column "Medium/Format">
+<!ENTITY zotero.items.genre_column "Genre">
+<!ENTITY zotero.items.system_column "System">
+<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "在圖書館中顯示">
 <!ENTITY zotero.items.menu.attach.note "加入筆記">
@@ -104,6 +121,7 @@
 <!ENTITY zotero.item.textTransform "轉換文字">
 <!ENTITY zotero.item.textTransform.titlecase "標題大小寫">
 <!ENTITY zotero.item.textTransform.sentencecase "文句式大小寫">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
 
 <!ENTITY zotero.toolbar.newNote "新的筆記">
 <!ENTITY zotero.toolbar.note.standalone "新增獨立筆記">
@@ -121,10 +139,18 @@
 <!ENTITY zotero.tagSelector.selectVisible "選取可見的">
 <!ENTITY zotero.tagSelector.clearVisible "取消可見的選取">
 <!ENTITY zotero.tagSelector.clearAll "取消全部的選取">
+<!ENTITY zotero.tagSelector.assignColor "Assign Color…">
 <!ENTITY zotero.tagSelector.renameTag "重新命名標籤…">
 <!ENTITY zotero.tagSelector.deleteTag "刪除標籤…">
 
+<!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
+<!ENTITY zotero.tagColorChooser.color "Color:">
+<!ENTITY zotero.tagColorChooser.position "Position:">
+<!ENTITY zotero.tagColorChooser.setColor "Set Color">
+<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+
 <!ENTITY zotero.lookup.description "輸入 ISBN, DOI, 或 PMID 後在下面的方塊中尋找">
+<!ENTITY zotero.lookup.button.search "Search">
 
 <!ENTITY zotero.selectitems.title "選取項目">
 <!ENTITY zotero.selectitems.intro.label "選取要加到你的圖書館的項目">
@@ -209,6 +235,10 @@
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "未勾選的標籤將不會被儲存。">
 <!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "這個標籤將會從所有項目中被刪除。">
 
+<!ENTITY zotero.merge.title "Conflict Resolution">
+<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.deleted "Deleted">
+
 <!ENTITY zotero.proxy.recognized.title "代理伺服器已認定">
 <!ENTITY zotero.proxy.recognized.warning "僅加入你的圖書館，學校，或公司網站所連結的代理伺服器。">
 <!ENTITY zotero.proxy.recognized.warning.secondary "加入其他的代理伺服器會讓惡意網站偽裝成你所信任的網站。">
diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties
index a95872209d..21981d76a2 100644
--- a/chrome/locale/zh-TW/zotero/zotero.properties
+++ b/chrome/locale/zh-TW/zotero/zotero.properties
@@ -14,6 +14,9 @@ general.restartLater=待會再重新啟動
 general.restartApp=Restart %S
 general.errorHasOccurred=發生了一個錯誤。
 general.unknownErrorOccurred=發生了一個未知的錯誤。
+general.invalidResponseServer=Invalid response from server.
+general.tryAgainLater=Please try again in a few minutes.
+general.serverError=The server returned an error. Please try again.
 general.restartFirefox=請重新啟動 %S。
 general.restartFirefoxAndTryAgain=請重新啟動 %S 然後再試一次。
 general.checkForUpdate=檢查更新
@@ -35,8 +38,12 @@ general.seeForMoreInformation=更多資訊請看 %S
 general.enable=啟用
 general.disable=停用
 general.remove=移除
+general.reset=Reset
+general.quit=Quit
+general.useDefault=Use Default
 general.openDocumentation=開啟說明文件
 general.numMore=%S more…
+general.openPreferences=Open Preferences
 
 general.operationInProgress=Zotero 有動作正在進行中。
 general.operationInProgress.waitUntilFinished=請稍候，直到動作完成。
@@ -68,6 +75,22 @@ errorReport.advanceMessage=按 %S 鍵來寄送一份錯誤報告給 Zotero 的
 errorReport.stepsToReproduce=重現錯誤的步驟：
 errorReport.expectedResult=預期的給果：
 errorReport.actualResult=實際的結果：
+errorReport.noNetworkConnection=No network connection
+errorReport.invalidResponseRepository=Invalid response from repository
+errorReport.repoCannotBeContacted=Repository cannot be contacted
+
+
+attachmentBasePath.selectDir=Choose Base Directory
+attachmentBasePath.chooseNewPath.title=Confirm New Base Directory
+attachmentBasePath.chooseNewPath.message=Linked file attachments below this directory will be saved using relative paths.
+attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
+attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
+attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
+attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.button=Clear Base Directory Setting
 
 dataDir.notFound=找不到 Zotero 的資料儲存目錄。
 dataDir.previousDir=之前的目錄：
@@ -75,6 +98,10 @@ dataDir.useProfileDir=使用 Firefox 個人設定檔目錄
 dataDir.selectDir=選擇 Zotero 的資料儲存目錄
 dataDir.selectedDirNonEmpty.title=目錄不是空的
 dataDir.selectedDirNonEmpty.text=你選擇的目錄不是空的而且它不像是 Zotero 的資料儲存目錄。\n\n仍然要在這個目錄中建立 Zotero 的檔案嗎？
+dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually copy files from the existing data directory to the new location. See http://zotero.org/support/zotero_data for more information.\n\nUse the new directory?
+dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
 dataDir.standaloneMigration.title=發現已存在的 Zotero 圖書館
 dataDir.standaloneMigration.description=這似乎是你第一次使用 %1$S。你要 %1$S 從 %2$S 中匯入你的設定並使用你現有的資料目錄嗎？
 dataDir.standaloneMigration.multipleProfiles=%1$S 將會與最近用過的個人資料共用它的資料目錄。
@@ -114,6 +141,7 @@ pane.collections.newSavedSeach=新增存留搜尋
 pane.collections.savedSearchName=為這個存留搜尋命名：
 pane.collections.rename=重新命名這個收集：
 pane.collections.library=我的圖書館
+pane.collections.groupLibraries=Group Libraries
 pane.collections.trash=垃圾筒
 pane.collections.untitled=未命名
 pane.collections.unfiled=未歸檔項目
@@ -138,8 +166,14 @@ pane.tagSelector.delete.message=你確定要刪除這個標籤嗎？\n\n將會
 pane.tagSelector.numSelected.none=沒有選取標籤
 pane.tagSelector.numSelected.singular=選取了 %S 個標籤
 pane.tagSelector.numSelected.plural=選取了 %S 個標籤
+pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
+
+tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=正在載入項目清單…
+pane.items.attach.link.uri.title=Attach Link to URI
+pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=移到垃圾筒
 pane.items.trash=您確定要將選取的項目移到垃圾筒？
 pane.items.trash.multiple=您確定要將選取的項目移到垃圾筒？
@@ -179,7 +213,12 @@ pane.item.selected.multiple=選取了 %S 個項目
 pane.item.unselected.zero=No items in this view
 pane.item.unselected.singular=%S item in this view
 pane.item.unselected.plural=%S items in this view
-pane.item.selectToMerge=Select items to merge
+
+pane.item.duplicates.selectToMerge=Select items to merge
+pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
+pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
 
 pane.item.changeType.title=改變項目類型
 pane.item.changeType.text=你確定要改變項目的類型嗎？\n\n下列的欄位資料將會消失：
@@ -205,14 +244,15 @@ pane.item.attachments.count.zero=%S 個附件：
 pane.item.attachments.count.singular=%S 個附件：
 pane.item.attachments.count.plural=%S 個附件：
 pane.item.attachments.select=選取檔案
+pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Zotero preferences.
+pane.item.attachments.filename=Filename
 pane.item.noteEditor.clickHere=點選此處
-pane.item.tags=標籤：
 pane.item.tags.count.zero=%S 個標籤：
 pane.item.tags.count.singular=%S 個標籤：
 pane.item.tags.count.plural=%S 個標籤：
 pane.item.tags.icon.user=使用者加上的標籤
 pane.item.tags.icon.automatic=自動加上的標籤
-pane.item.related=相關的：
 pane.item.related.count.zero=%S 個相關的：
 pane.item.related.count.singular=%S 個相關的：
 pane.item.related.count.plural=%S 個相關的：
@@ -416,6 +456,7 @@ save.error.cannotAddFilesToCollection=你不能新增檔案到目前所選定的
 ingester.saveToZotero=儲存到 Zotero
 ingester.saveToZoteroUsing=用『%S』來存到 Zotero
 ingester.scraping=儲存項目中…
+ingester.scrapingTo=Saving to
 ingester.scrapeComplete=項目己儲存
 ingester.scrapeError=無法儲存項目
 ingester.scrapeErrorDescription=儲存這個項目時發生了錯誤。可檢查 %S 以取得更多資訊。
@@ -428,6 +469,7 @@ ingester.importReferRISDialog.checkMsg=對這網站一律允許
 
 ingester.importFile.title=匯入檔案
 ingester.importFile.text=你要匯入 "%S" 檔案嗎？\n\n項目會加入到一個新的收集裡。
+ingester.importFile.intoNewCollection=Import into new collection
 
 ingester.lookup.performing=正在進行查詢…
 ingester.lookup.error=在查詢這個項目時發生了錯誤。
@@ -455,6 +497,19 @@ zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when
 zotero.preferences.openurl.resolversFound.zero=發現了 %S 個解析器
 zotero.preferences.openurl.resolversFound.singular=發現了 %S 個解析器
 zotero.preferences.openurl.resolversFound.plural=發現了 %S 個解析器
+
+zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
+zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
+zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
+zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
+zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to complete the restore process.
+zotero.preferences.sync.reset.restoreToServer=All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
+zotero.preferences.sync.reset.replaceServerData=Replace Server Data
+zotero.preferences.sync.reset.fileSyncHistory=All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+
 zotero.preferences.search.rebuildIndex=重建索引
 zotero.preferences.search.rebuildWarning=你要重建整個索引嗎？這可能要花一陣子。\n\n如果只要做尚未索引的項目的索引，可按 %S 鍵。
 zotero.preferences.search.clearIndex=清除索引
@@ -491,6 +546,10 @@ zotero.preferences.advanced.resetTranslators.changesLost=將會失去任何新
 zotero.preferences.advanced.resetStyles=重設樣式
 zotero.preferences.advanced.resetStyles.changesLost=將會失去任何新增或修改過的樣式
 
+zotero.preferences.advanced.debug.title=Debug Output Submitted
+zotero.preferences.advanced.debug.sent=Debug output has been sent to the Zotero server.\n\nThe Debug ID is D%S.
+zotero.preferences.advanced.debug.error=An error occurred sending debug output.
+
 dragAndDrop.existingFiles=以下的檔案已經存在目的目錄中，並未被複製：
 dragAndDrop.filesNotFound=找不到以下的檔案而無法加以複製：
 
@@ -500,7 +559,8 @@ fileInterface.import=匯入
 fileInterface.export=匯出
 fileInterface.exportedItems=匯出了項目
 fileInterface.imported=匯入了
-fileInterface.fileFormatUnsupported=找不到可用來轉譯指定檔案的轉譯器。
+fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.viewSupportedFormats=View Supported Formats…
 fileInterface.untitledBibliography=未命名的參考書目
 fileInterface.bibliographyHTMLTitle=參考書目
 fileInterface.importError=匯入選取檔案時發生錯誤。請確定這檔案是有效的，並再試一次。
@@ -509,6 +569,10 @@ fileInterface.noReferencesError=你所選取的項目並未含有參考文獻。
 fileInterface.bibliographyGenerationError=在建立你的參考書目時發生了錯誤。請再試一次。
 fileInterface.exportError=在嘗試匯出選取檔案時發生了錯誤。
 
+quickSearch.mode.titleCreatorYear=Title, Creator, Year
+quickSearch.mode.fieldsAndTags=All Fields & Tags
+quickSearch.mode.everything=Everything
+
 advancedSearchMode=進階搜尋模式——按輸入鍵來搜尋。
 searchInProgress=正在搜尋中——請稍候。
 
@@ -613,6 +677,7 @@ integration.cited.loading=載入被引用項目…
 integration.ibid=ibid 或前引文獻
 integration.emptyCitationWarning.title=引用文獻空白
 integration.emptyCitationWarning.body=你所給定的引用文獻用在目前所選用的式樣中會是空白的。你確定要把它加入嗎？
+integration.openInLibrary=Open in %S
 
 integration.error.incompatibleVersion=此版本的 Zotero word processor plugin ($INTEGRATION_VERSION) 與目前安裝的 Zotero Firefox extension (%1$S) 不相容。請確認你正在使用兩者的最新版本。
 integration.error.incompatibleVersion2=Zotero %1$S 需要 %2$S %3$S 或更晚。請由 zotero.org 下載 %2$S 的最新版。
@@ -643,14 +708,22 @@ integration.citationChanged=自 Zotero 產生此引用文獻條後，您又修
 integration.citationChanged.description=按「確定」將防止 Zotero 未來在您新增附加的引用文獻條、切換樣式，或修改它所指向的參考資料後更新此引用文獻條。按「否定」會移除您做的變更。
 integration.citationChanged.edit=自 Zotero 產生此引用文獻後，您又修改過它。編輯會清除您的修改。還要繼續嗎？
 
+styles.install.title=Install Style
+styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=從 %2$S 安裝樣式 "%1$S"？
 styles.updateStyle=從 %3$S 用 "%2$S" 更新現有的樣式 "%1$S"？
 styles.installed=已成功安裝樣式 "%S"。
 styles.installError=%S 不像是個正確的樣式檔。
+styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue?
 styles.installSourceError=%1$S 指引到一個無效或不存在 %2$S 的 CSL 檔為它的來源。
 styles.deleteStyle=你確定要刪除樣式『%1$S』？
 styles.deleteStyles=你確定要刪除所選的樣式嗎？
 
+styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
+styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
+
+sync.sync=Sync
 sync.cancel=取消同步
 sync.openSyncPreferences=開啟同步偏好設定……
 sync.resetGroupAndSync=重設群組與同步
@@ -660,8 +733,10 @@ sync.remoteObject=遠端的物件
 sync.mergedObject=合併的物件
 
 sync.error.usernameNotSet=沒有設定使用者名稱
+sync.error.usernameNotSet.text=You must enter your zotero.org username and password in the Zotero preferences to sync with the Zotero server.
 sync.error.passwordNotSet=沒有設定密碼
 sync.error.invalidLogin=無效的使用者名稱或密碼
+sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=請輸入一組密碼。
 sync.error.loginManagerCorrupted1=Zotero 無法存取你的登入資訊，可能是由於 Firefox 登入管理資料庫壞掉了。
 sync.error.loginManagerCorrupted2=關閉 Firefox，備份並刪除你 Firefox profile 中的 signons.*，並在 Zotero 偏好設定的同步窗格中重新輸入你的 Zotero 登入資訊。
@@ -672,6 +747,41 @@ sync.error.groupWillBeReset=如果繼續，你的群組拷貝將會被重設回
 sync.error.copyChangedItems=如果你要有機會把你作的更改複製到別的地方或是向群組管理者要求寫入的權力，則現在取消這個同步化。
 sync.error.manualInterventionRequired=自動同步導致了一個衝突，需要手動介入。
 sync.error.clickSyncIcon=點擊同步圖示來進行手動同步
+sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
+sync.error.sslConnectionError=SSL connection error
+sync.error.checkConnection=Error connecting to server. Check your Internet connection.
+sync.error.emptyResponseServer=Empty response from server.
+sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
+
+sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
+sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
+sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
+sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
+
+sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
+sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
+sync.conflict.remoteVersionsKept=The remote versions have been kept.
+sync.conflict.remoteVersionKept=The remote version has been kept.
+sync.conflict.localVersionsKept=The local versions have been kept.
+sync.conflict.localVersionKept=The local version has been kept.
+sync.conflict.recentVersionsKept=The most recent versions have been kept.
+sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
+sync.conflict.viewErrorConsole=View the%S Error Console for the full list of such changes.
+sync.conflict.localVersion=Local version: %S
+sync.conflict.remoteVersion=Remote version: %S
+sync.conflict.deleted=[deleted]
+sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
+sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
+sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
+sync.conflict.tag.addedToRemote=It has been added to the following remote items:
+sync.conflict.tag.addedToLocal=It has been added to the following local items:
+
+sync.conflict.fileChanged=The following file has been changed in multiple locations.
+sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
+sync.conflict.chooseThisVersion=Choose this version
 
 sync.status.notYetSynced=尚未同步
 sync.status.lastSync=上次同步：
@@ -682,9 +792,12 @@ sync.status.uploadingData=上傳資料到同步伺服器
 sync.status.uploadAccepted=上傳被接受了－正在等候同步伺服器
 sync.status.syncingFiles=正在同步的檔案
 
+sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=剩下 %SKB
 sync.storage.filesRemaining=%1$S/%2$S 檔案
 sync.storage.none=無
+sync.storage.downloads=Downloads:
+sync.storage.uploads=Uploads:
 sync.storage.localFile=本機的檔案
 sync.storage.remoteFile=遠端的檔案
 sync.storage.savedFile=已儲存的檔案
@@ -692,18 +805,24 @@ sync.storage.serverConfigurationVerified=已驗證伺服器設定
 sync.storage.fileSyncSetUp=已成功設定檔案同步。
 sync.storage.openAccountSettings=開放帳戶設定
 
+sync.storage.error.default=A file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, restart %S and/or your computer and try again. If you continue to receive the message, submit an error report and post the Report ID to a new thread in the Zotero Forums.
+sync.storage.error.defaultRestart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf you receive this message repeatedly, submit an error report and post the Report ID to a new thread in the Zotero Forums.
 sync.storage.error.serverCouldNotBeReached=無法到達 %S 這個伺服器。
 sync.storage.error.permissionDeniedAtAddress=你在以下的位址沒有建立 Zotero 資料夾的權限：
 sync.storage.error.checkFileSyncSettings=請檢查你的檔案同步設定或與你的伺服器管理員聯絡。
 sync.storage.error.verificationFailed=%S 驗證失敗。請到 Zotero 偏好設定內的同步窗格查驗你的檔案同步設定。
 sync.storage.error.fileNotCreated=於 Zotero 'storage' 目錄，無法建立檔案 '%S'。
+sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
 sync.storage.error.fileEditingAccessLost=你不再能夠存取 Zotero 群組 '%S' 檔案編輯，你所新增或編輯的檔案無法與伺服器同步。
 sync.storage.error.copyChangedItems=如果你想要有機會把更改過的項目複製到別處，則現在取消同步化。
 sync.storage.error.fileUploadFailed=上傳檔案失敗。
 sync.storage.error.directoryNotFound=找不到目錄
 sync.storage.error.doesNotExist=%S 不存在。
 sync.storage.error.createNow=你要現在建立它嗎？
-sync.storage.error.webdav.enterURL=請輸入一個 WebDAV 網址。
+
+sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
+sync.storage.error.webdav.enterURL=Please enter a WebDAV URL.
 sync.storage.error.webdav.invalidURL=%S 不是一個有效的 WebDAV 網址。
 sync.storage.error.webdav.invalidLogin=WebDAV 伺服器不接受你所輸入的使用者名和密碼。
 sync.storage.error.webdav.permissionDenied=你沒有存取 WebDAV 伺服器上 %S 的許可。
@@ -713,10 +832,17 @@ sync.storage.error.webdav.sslConnectionError=連接到 %S 時產生了 SSL 連
 sync.storage.error.webdav.loadURLForMoreInfo=用瀏覽器載入你的 WebDAV 網址來取得更多資訊。
 sync.storage.error.webdav.seeCertOverrideDocumentation=見抑制安全憑證文件以獲更多資訊。
 sync.storage.error.webdav.loadURL=載入 WebDAV URL
+sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
+sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
+sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
+
+sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
 sync.storage.error.zfs.personalQuotaReached1=你已經到達 Zotero 檔案儲存的限額。有些檔案沒有上傳。其他的 Zotero 資料會繼續同步化到伺服器。
 sync.storage.error.zfs.personalQuotaReached2=你在 zotero.org 的帳號設定有更多的儲存選項。
 sync.storage.error.zfs.groupQuotaReached1='%S' 群組已經到達 Zotero 檔案儲存的限額。有些檔案沒有上傳。其他的 Zotero 資料會繼續同步化到伺服器。
 sync.storage.error.zfs.groupQuotaReached2=群組的擁有人可以在 zotero.org 的儲存設定區增加群組的儲存容量。
+sync.storage.error.zfs.fileWouldExceedQuota=The file '%S' would exceed your Zotero File Storage quota
 
 sync.longTagFixer.saveTag=儲存標籤
 sync.longTagFixer.saveTags=儲存標籤
@@ -743,6 +869,7 @@ recognizePDF.couldNotRead=無法由 PDF 檔中讀取文字。
 recognizePDF.noMatches=找不到對映的參考索引。
 recognizePDF.fileNotFound=找不到檔案。
 recognizePDF.limit=到達查詢極限。請稍後再試。
+recognizePDF.error=An unexpected error occurred.
 recognizePDF.complete.label=詮釋資料取回完成。
 recognizePDF.close.label=關閉
 
@@ -753,8 +880,21 @@ rtfScan.rtf=富文格式 (.rtf)
 rtfScan.saveTitle=選一個位置來貯存格式化過的檔案
 rtfScan.scannedFileSuffix=(已掃描)
 
+
+file.accessError.theFile=The file '%S'
+file.accessError.aFile=A file
+file.accessError.cannotBe=cannot be
+file.accessError.created=created
+file.accessError.updated=updated
+file.accessError.deleted=deleted
+file.accessError.message.windows=Check that the file is not currently in use and that it is not marked as read-only. To check all files in your Zotero data directory, right-click on the 'zotero' directory, click Properties, clear the Read-Only checkbox, and apply the change to all folders and files in the directory.
+file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
+file.accessError.restart=Restarting your computer or disabling security software may also help.
+file.accessError.showParentDir=Show Parent Directory
+
 lookup.failure.title=查找失敗
 lookup.failure.description=Zotero 找不到指定標識符的記錄。請確認標識符後再試。
+lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
 locate.online.label=線上檢視
 locate.online.tooltip=到線上此項目
diff --git a/chrome/skin/default/zotero/bindings/tagsbox.css b/chrome/skin/default/zotero/bindings/tagsbox.css
new file mode 100644
index 0000000000..d5c0ab06a9
--- /dev/null
+++ b/chrome/skin/default/zotero/bindings/tagsbox.css
@@ -0,0 +1,3 @@
+textbox {
+	margin: 0;
+}
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 3a8be142c6..e3aebd5dc4 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -226,8 +226,8 @@
 
 #zotero-item-pane
 {
-	width: 335px;
-	min-width: 335px;
+	width: 338px;
+	min-width: 338px;
 }
 
 #zotero-pane .toolbar
@@ -273,6 +273,10 @@
   display: none;
 }
 
+.zotero-button-clear-image {
+  list-style-image: none
+}
+
 #zotero-tb-collection-add
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-collection-add.png');
@@ -311,6 +315,11 @@
 	list-style-image: url('chrome://zotero/skin/toolbar-lookup.png');
 }
 
+#zotero-lookup-multiline-progress
+{
+	height: 2em;
+}
+
 #zotero-tb-item-from-page
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-item-from-page.png');
diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt
index 4371ce1103..3c34c16118 100644
--- a/resource/schema/repotime.txt
+++ b/resource/schema/repotime.txt
@@ -1 +1 @@
-2013-02-19 00:25:00
+2013-03-14 06:00:00
diff --git a/styles b/styles
index 47c49468f4..ac65a632fe 160000
--- a/styles
+++ b/styles
@@ -1 +1 @@
-Subproject commit 47c49468f4d829a43bee6c4105f83b37c91a2fb7
+Subproject commit ac65a632fe70d1ea8d4e354da3bc236190d46e6f
diff --git a/translators b/translators
index 15385de597..91baefb008 160000
--- a/translators
+++ b/translators
@@ -1 +1 @@
-Subproject commit 15385de597ac53a3b5397371aa01e578e136fe62
+Subproject commit 91baefb00887e6d6765c31c9c221b45200f8a26f