Merge branch '3.0'

chrome/content/zotero/about.xul

@@ -278,7 +278,8 @@
 				</vbox>
 				<label class="subhead" value="&zotero.about.additionalSoftware;"/>
 				<vbox class="subcontent">
-					<label class="zotero-text-link" href="http://www.famfamfam.com/lab/icons/silk/" value="famfamfam (small icons)"/>
+					<label class="zotero-text-link" href="http://www.famfamfam.com/lab/icons/silk/" value="Silk icons (by Mark James)"/>
+					<label class="zotero-text-link" href="http://p.yusukekamiyamane.com/" value="Fugue icons (by Yusuke Kamiyamane)"/>
 					<label class="zotero-text-link" href="http://simile.mit.edu/timeline/" value="SIMILE Project (Timeline)"/>
 					<label class="zotero-text-link" href="http://www.w3.org/2005/ajar/tab" value="Tabulator (RDF parser)"/>
 					<label class="zotero-text-link" href="http://tango.freedesktop.org/Tango_Desktop_Project" value="Tango Desktop Project (pref icons)"/>

chrome/content/zotero/preferences/preferences.js

@@ -1936,7 +1936,7 @@ function openInViewer(uri, newTab) {
 			win.loadURI(uri);
 		} else {
 			window.openDialog("chrome://zotero/content/standalone/basicViewer.xul",
-				"basicViewer", "chrome,resizable,centerscreen", uri);
+				"basicViewer", "chrome,resizable,centerscreen,menubar,scrollbars", uri);
 		}
 	} else {
 		var win = wm.getMostRecentWindow("navigator:browser");

chrome/content/zotero/preferences/preferences.xul

@@ -339,6 +339,7 @@ To add a new preference:
 						<separator class="thin"/>
 						
 						<vbox>
+							<label class="zotero-text-link" style="margin-top:.3em; margin-left: 0" value="&zotero.preferences.sync.fileSyncing.about;" href="http://www.zotero.org/support/sync#file_syncing"/>
 							<hbox id="storage-terms" style="margin-top: .4em" align="center">
 								<label>&zotero.preferences.sync.fileSyncing.tos1;</label>
 								<label class="zotero-text-link" href="http://www.digitalscholar.org/z_terms" value="&zotero.preferences.sync.fileSyncing.tos2;"/>

chrome/content/zotero/standalone/standalone.js

@@ -128,7 +128,7 @@ const ZoteroStandalone = new function() {
 			win.loadURI(uri);
 		} else {
 			window.openDialog("chrome://zotero/content/standalone/basicViewer.xul",
-				"basicViewer", "chrome,resizable,centerscreen", uri);
+				"basicViewer", "chrome,resizable,centerscreen,menubar,scrollbars", uri);
 		}
 	}
 	

chrome/content/zotero/xpcom/citeproc.js

@@ -2189,7 +2189,7 @@ CSL.DateParser = function () {
 };
 CSL.Engine = function (sys, style, lang, forceLang) {
     var attrs, langspec, localexml, locale;
-    this.processor_version = "1.0.328";
+    this.processor_version = "1.0.329";
     this.csl_version = "1.0";
     this.sys = sys;
     this.sys.xml = new CSL.System.Xml.Parsing();
@@ -2620,7 +2620,6 @@ CSL.Engine.prototype.remapSectionVariable = function (inputList) {
         var value = false;
         if (["bill","gazette","legislation"].indexOf(Item.type) > -1) {
             if (!Item.section
-                && !Item.page
                 && this.opt.development_extensions.clobber_locator_if_no_statute_section) {
                 item.locator = undefined;
                 item.label = undefined;
@@ -6025,16 +6024,18 @@ CSL.NameOutput.prototype._clearValues = function (values) {
     }
 };
 CSL.NameOutput.prototype._checkNickname = function (name) {
-    var author = "";
+    if (["interview", "personal_communication"].indexOf(this.Item.type) > -1) {
-    author = CSL.Util.Names.getRawName(name);
+        var author = "";
-    if (author && this.state.sys.getAbbreviation && !(this.item && this.item["suppress-author"])) {
+        author = CSL.Util.Names.getRawName(name);
-        this.state.transform.loadAbbreviation("default", "nickname", author);
+        if (author && this.state.sys.getAbbreviation && !(this.item && this.item["suppress-author"])) {
-        var myLocalName = this.state.transform.abbrevs["default"].nickname[author];
+            this.state.transform.loadAbbreviation("default", "nickname", author);
-        if (myLocalName) {
+            var myLocalName = this.state.transform.abbrevs["default"].nickname[author];
-            if (myLocalName === "{suppress}") {
+            if (myLocalName) {
-                name = false;
+                if (myLocalName === "{suppress}") {
-            } else {
+                    name = false;
-                name = {family:myLocalName,given:''};
+                } else {
+                    name = {family:myLocalName,given:''};
+                }
             }
         }
     }
@@ -12473,7 +12474,9 @@ CSL.Disambiguation.prototype.getCiteData = function(Item, base) {
     }
 };
 CSL.Disambiguation.prototype.captureStepToBase = function() {
-    this.betterbase.givens[this.gnameset][this.gname] = this.base.givens[this.gnameset][this.gname];
+    if (this.state.opt["givenname-disambiguation-rule"] === "by-cite") {
+        this.betterbase.givens[this.gnameset][this.gname] = this.base.givens[this.gnameset][this.gname];
+    }
     this.betterbase.names[this.gnameset] = this.base.names[this.gnameset];
 };
 CSL.Registry.CitationReg = function (state) {

chrome/content/zotero/xpcom/data/cachedTypes.js

@@ -336,7 +336,6 @@ Zotero.ItemTypes = new function() {
 			}
 		}
 		
-		// DEBUG: only have icons for some types so far
 		switch (itemType) {
 			case 'attachment-file':
 			case 'attachment-link':
@@ -345,14 +344,21 @@ Zotero.ItemTypes = new function() {
 			case 'attachment-pdf':
 			case 'artwork':
 			case 'audioRecording':
+			case 'bill':
 			case 'blogPost':
 			case 'book':
 			case 'bookSection':
+			case 'case':
 			case 'computerProgram':
 			case 'conferencePaper':
+			case 'dictionaryEntry':
+			case 'document':
 			case 'email':
+			case 'encyclopediaArticle':
 			case 'film':
 			case 'forumPost':
+			case 'hearing':
+			case 'instantMessage':
 			case 'interview':
 			case 'journalArticle':
 			case 'letter':
@@ -361,9 +367,12 @@ Zotero.ItemTypes = new function() {
 			case 'map':
 			case 'newspaperArticle':
 			case 'note':
+			case 'patent':
 			case 'podcast':
+			case 'presentation':
 			case 'radioBroadcast':
 			case 'report':
+			case 'statute':
 			case 'thesis':
 			case 'tvBroadcast':
 			case 'videoRecording':

chrome/content/zotero/xpcom/integration.js

@@ -653,7 +653,7 @@ Zotero.Integration = new function() {
 					
 					if(!message && typeof(e) == "object") message = "\n\n"+e.toString();
 					
-					if(message != "\n\nExceptionAlreadyDisplayed") {
+					if(message.indexOf("ExceptionAlreadyDisplayed") !== -1) {
 						displayError = Zotero.getString("integration.error.generic")+message;
 					}
 					Zotero.debug(e);

chrome/content/zotero/xpcom/rdf.js

@@ -1,6 +0,0 @@
-// Tweaks to get the Tabulator RDF library to work without Tabulator. All of this happens in the
-// Zotero.RDF.AJAW namespace.
-var kb = new RDFIndexedFormula();
-var tabulator = {log:{debug:function(arg) {
-	Zotero.debug(arg, 4);
-}}};

chrome/content/zotero/xpcom/rdf/identity.js

@@ -1,6 +1,6 @@
 //  Identity management and indexing for RDF
 //
-// This file provides  RDFIndexedFormula a formula (set of triples) which
+// This file provides  IndexedFormula a formula (set of triples) which
 // indexed by predicate, subject and object.
 //
 // It "smushes"  (merges into a single node) things which are identical 
@@ -12,582 +12,484 @@
 //  2007    Changed so as not to munge statements from documents when smushing
 //
 // 
+/*jsl:option explicit*/
+// Turn on JavaScriptLint variable declaration checking
+$rdf.IndexedFormula = function () {
 
-/*jsl:option explicit*/ // Turn on JavaScriptLint variable declaration checking
+  var owl_ns = "http://www.w3.org/2002/07/owl#";
-
+  // var link_ns = "http://www.w3.org/2007/ont/link#";
-owl_ns = "http://www.w3.org/2002/07/owl#";
+  /* hashString functions are used as array indeces. This is done to avoid
-link_ns = "http://www.w3.org/2006/link#";
+   ** conflict with existing properties of arrays such as length and map.
-
+   ** See issue 139.
-/* hashString functions are used as array indeces. This is done to avoid
+   */
-** conflict with existing properties of arrays such as length and map.
+  $rdf.Literal.prototype.hashString = $rdf.Literal.prototype.toNT;
-** See issue 139.
+  $rdf.Symbol.prototype.hashString = $rdf.Symbol.prototype.toNT;
-*/
+  $rdf.BlankNode.prototype.hashString = $rdf.BlankNode.prototype.toNT;
-RDFLiteral.prototype.hashString = RDFLiteral.prototype.toNT;
+  $rdf.Collection.prototype.hashString = $rdf.Collection.prototype.toNT;
-RDFSymbol.prototype.hashString = RDFSymbol.prototype.toNT;
-RDFBlankNode.prototype.hashString = RDFBlankNode.prototype.toNT;
-RDFCollection.prototype.hashString = RDFCollection.prototype.toNT;
-
-RDFIndexedFormula.prototype = new RDFFormula();
-RDFIndexedFormula.prototype.constructor = RDFIndexedFormula;
-// RDFIndexedFormula.superclass = RDFFormula.prototype;
-RDFIndexedFormula.SuperClass = RDFFormula;
-
-RDFArrayRemove = function(a, x) {  //removes all elements equal to x from a
-    for(var i=0; i<a.length; i++) {
-	if (a[i] == x) {
-            a.splice(i,1);
-            return;
-	}
-    }
-    throw "RDFArrayRemove: Array did not contain " + x;
-};
 
 
-
+  //Stores an associative array that maps URIs to functions
-//Stores an associative array that maps URIs to functions
+  $rdf.IndexedFormula = function (features) {
-function RDFIndexedFormula(features) {
+    this.statements = []; // As in Formula
-    this.statements = [];    // As in RDFFormula
     this.optional = [];
     this.propertyActions = []; // Array of functions to call when getting statement with {s X o}
     //maps <uri> to [f(F,s,p,o),...]
-    this.classActions = [];   // Array of functions to call when adding { s type X }
+    this.classActions = []; // Array of functions to call when adding { s type X }
-    this.redirections = [];   // redirect to lexically smaller equivalent symbol
+    this.redirections = []; // redirect to lexically smaller equivalent symbol
-    this.aliases = [];   // reverse mapping to redirection: aliases for this
+    this.aliases = []; // reverse mapping to redirection: aliases for this
     this.HTTPRedirects = []; // redirections we got from HTTP
-    this.subjectIndex = [];  // Array of statements with this X as subject
+    this.subjectIndex = []; // Array of statements with this X as subject
-    this.predicateIndex = [];  // Array of statements with this X as subject
+    this.predicateIndex = []; // Array of statements with this X as subject
-    this.objectIndex = [];  // Array of statements with this X as object
+    this.objectIndex = []; // Array of statements with this X as object
-    this.whyIndex = [];     // Array of statements with X as provenance
+    this.whyIndex = []; // Array of statements with X as provenance
-    this.index = [ this.subjectIndex, this.predicateIndex, this.objectIndex, this.whyIndex ];
+    this.index = [this.subjectIndex, this.predicateIndex, this.objectIndex, this.whyIndex];
     this.namespaces = {} // Dictionary of namespace prefixes
-    if (features == undefined) features = ["sameAs",
+    if(features === undefined) features = ["sameAs",
-                    "InverseFunctionalProperty", "FunctionalProperty"];
+                                "InverseFunctionalProperty", "FunctionalProperty"];
-//    this.features = features
+    //    this.features = features
-
     // Callbackify?
-    
     function handleRDFType(formula, subj, pred, obj, why) {
-        if (formula.typeCallback != undefined)
+      if(formula.typeCallback != undefined)
-            formula.typeCallback(formula, obj, why);
+        formula.typeCallback(formula, obj, why);
 
-        var x = formula.classActions[obj.hashString()];
+      var x = formula.classActions[obj.hashString()];
-        var done = false;
+      var done = false;
-        if (x) {
+      if(x) {
-            for (var i=0; i<x.length; i++) {                
+        for(var i = 0; i < x.length; i++) {
-                done = done || x[i](formula, subj, pred, obj, why);
+          done = done || x[i](formula, subj, pred, obj, why);
-            }
         }
-        return done; // statement given is not needed if true
+      }
+      return done; // statement given is not needed if true
     } //handleRDFType
-
     //If the predicate is #type, use handleRDFType to create a typeCallback on the object
-    this.propertyActions[
+    this.propertyActions['<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'] = [handleRDFType];
-	'<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'] = [ handleRDFType ];
 
     // Assumption: these terms are not redirected @@fixme
-    if (features.indexOf("sameAs") >=0)
+    if($rdf.Util.ArrayIndexOf(features, "sameAs") >= 0)
-        this.propertyActions['<http://www.w3.org/2002/07/owl#sameAs>'] = [
+      this.propertyActions['<http://www.w3.org/2002/07/owl#sameAs>'] = [
-	function(formula, subj, pred, obj, why) {
+      function (formula, subj, pred, obj, why) {
-            formula.equate(subj,obj);
+      // tabulator.log.warn("Equating "+subj.uri+" sameAs "+obj.uri);  //@@
-            return true; // true if statement given is NOT needed in the store
+      formula.equate(subj, obj);
-	}]; //sameAs -> equate & don't add to index
+      return true; // true if statement given is NOT needed in the store
-/*
+    }]; //sameAs -> equate & don't add to index
-    function newPropertyAction(formula, pred, action) {
+    if($rdf.Util.ArrayIndexOf(features, "InverseFunctionalProperty") >= 0)
-	tabulator.log.debug("newPropertyAction:  "+pred);
+      this.classActions["<" + owl_ns + "InverseFunctionalProperty>"] = [
-        if (formula.propertyActions[pred] == undefined)
+      function (formula, subj, pred, obj, addFn) {
-            formula.propertyActions[pred] = [];
+      return formula.newPropertyAction(subj, handle_IFP); // yes subj not pred!
-        formula.propertyActions[pred].push(action);
+    }]; //IFP -> handle_IFP, do add to index
-        // Now apply the function to to statements already in the store
+    if($rdf.Util.ArrayIndexOf(features, "FunctionalProperty") >= 0)
-	var toBeFixed = formula.statementsMatching(undefined, pred, undefined);
+      this.classActions["<" + owl_ns + "FunctionalProperty>"] = [
-	var i;
+        function (formula, subj, proj, obj, addFn) {
-	for (i=0; i<toBeFixed.length; i++) { // NOT optimized - sort toBeFixed etc
+         return formula.newPropertyAction(subj, handle_FP);
-	    if (action(formula, toBeFixed[i].subject, pred, toBeFixed[i].object)) {
+        }
-		tabulator.log.debug("newPropertyAction: NOT removing "+toBeFixed[i]);
+      ]; //FP => handleFP, do add to index
-	    }
+    function handle_IFP(formula, subj, pred, obj) {
-	}
+      var s1 = formula.any(undefined, pred, obj);
-	return false;
+      if(s1 == undefined) return false; // First time with this value
-    }
+      // tabulator.log.warn("Equating "+s1.uri+" and "+subj.uri + " because IFP "+pred.uri);  //@@
-*/
+      formula.equate(s1, subj);
-    if (features.indexOf("InverseFunctionalProperty") >= 0)
+      return true;
-        this.classActions["<"+owl_ns+"InverseFunctionalProperty>"] = [
-            function(formula, subj, pred, obj, addFn) {
-                return formula.newPropertyAction(subj, handle_IFP); // yes subj not pred!
-            }]; //IFP -> handle_IFP, do add to index
-
-    if (features.indexOf("FunctionalProperty") >= 0)
-        this.classActions["<"+owl_ns+"FunctionalProperty>"] = [
-            function(formula, subj, proj, obj, addFn) {
-                return formula.newPropertyAction(subj, handle_FP);
-            }]; //FP => handleFP, do add to index
-
-    function handle_IFP(formula, subj, pred, obj)  {
-        var s1 = formula.any(undefined, pred, obj);
-        if (s1 == undefined) return false; // First time with this value
-        formula.equate(s1, subj);
-        return true;
     } //handle_IFP
-
+    function handle_FP(formula, subj, pred, obj) {
-    function handle_FP(formula, subj, pred, obj)  {
+      var o1 = formula.any(subj, pred, undefined);
-        var o1 = formula.any(subj, pred, undefined);
+      if(o1 == undefined) return false; // First time with this value
-        if (o1 == undefined) return false; // First time with this value
+      // tabulator.log.warn("Equating "+o1.uri+" and "+obj.uri + " because FP "+pred.uri);  //@@
-        formula.equate(o1, obj);
+      formula.equate(o1, obj);
-        return true ;
+      return true;
     } //handle_FP
-    
+  } /* end IndexedFormula */
-} /* end RDFIndexedFormula */
 
+  $rdf.IndexedFormula.prototype = new $rdf.Formula();
+  $rdf.IndexedFormula.prototype.constructor = $rdf.IndexedFormula;
+  $rdf.IndexedFormula.SuperClass = $rdf.Formula;
 
-
+  $rdf.IndexedFormula.prototype.newPropertyAction = function newPropertyAction(pred, action) {
-
+    //$rdf.log.debug("newPropertyAction:  "+pred);
-RDFIndexedFormula.prototype.newPropertyAction = function newPropertyAction(pred, action) {
-    tabulator.log.debug("newPropertyAction:  "+pred);
     var hash = pred.hashString();
-    if (this.propertyActions[hash] == undefined)
+    if(this.propertyActions[hash] == undefined)
-        this.propertyActions[hash] = [];
+      this.propertyActions[hash] = [];
     this.propertyActions[hash].push(action);
     // Now apply the function to to statements already in the store
     var toBeFixed = this.statementsMatching(undefined, pred, undefined);
-    done = false;
+    var done = false;
-    for (var i=0; i<toBeFixed.length; i++) { // NOT optimized - sort toBeFixed etc
+    for(var i = 0; i < toBeFixed.length; i++) { // NOT optimized - sort toBeFixed etc
-        done = done || action(this, toBeFixed[i].subject, pred, toBeFixed[i].object);
+      done = done || action(this, toBeFixed[i].subject, pred, toBeFixed[i].object);
     }
     return done;
-}
+  }
 
-
+  $rdf.IndexedFormula.prototype.setPrefixForURI = function (prefix, nsuri) {
-
-
-RDFPlainFormula = function() { return RDFIndexedFormula([]); } // No features
-
-
-RDFIndexedFormula.prototype.setPrefixForURI = function(prefix, nsuri) {
     //TODO:This is a hack for our own issues, which ought to be fixed post-release
-    //See http://dig.csail.mit.edu/cgi-bin/roundup.cgi/tabulator/issue227
+    //See http://dig.csail.mit.edu/cgi-bin/roundup.cgi/$rdf/issue227
-    if(prefix=="tab" && this.namespaces["tab"]) {
+    if(prefix == "tab" && this.namespaces["tab"]) {
-        return;
+      return;
     }
     this.namespaces[prefix] = nsuri
-}
+  }
 
-// Deprocated ... name too generic
+  // Deprocated ... name too generic
-RDFIndexedFormula.prototype.register = function(prefix, nsuri) {
+  $rdf.IndexedFormula.prototype.register = function (prefix, nsuri) {
     this.namespaces[prefix] = nsuri
-}
+  }
 
 
-/** simplify graph in store when we realize two identifiers are equal
+  /** simplify graph in store when we realize two identifiers are equivalent
 
 We replace the bigger with the smaller.
 
 */
-RDFIndexedFormula.prototype.equate = function(u1, u2) {
+  $rdf.IndexedFormula.prototype.equate = function (u1, u2) {
-    tabulator.log.debug("Equating "+u1+" and "+u2)
+    // tabulator.log.warn("Equating "+u1+" and "+u2); // @@
-    
+    //@@JAMBO Must canonicalize the uris to prevent errors from a=b=c
+    //03-21-2010
+    u1 = this.canon(u1);
+    u2 = this.canon(u2);
     var d = u1.compareTerm(u2);
-    if (!d) return true; // No information in {a = a}
+    if(!d) return true; // No information in {a = a}
     var big, small;
-    if (d < 0)  {  // u1 less than u2
+    if(d < 0) { // u1 less than u2
-	return this.replaceWith(u2, u1);
+      return this.replaceWith(u2, u1);
     } else {
-	return this.replaceWith(u1, u2);
+      return this.replaceWith(u1, u2);
     }
-}
+  }
 
-// Replace big with small, obsoleted with obsoleting.
+  // Replace big with small, obsoleted with obsoleting.
-//
+  //
-RDFIndexedFormula.prototype.replaceWith = function(big, small) {
+  $rdf.IndexedFormula.prototype.replaceWith = function (big, small) {
-    tabulator.log.debug("Replacing "+big+" with "+small) // @@
+    //$rdf.log.debug("Replacing "+big+" with "+small) // @@
     var oldhash = big.hashString();
     var newhash = small.hashString();
 
-    var moveIndex = function(ix) {
+    var moveIndex = function (ix) {
         var oldlist = ix[oldhash];
-        if (oldlist == undefined) return; // none to move
+        if(oldlist == undefined) return; // none to move
         var newlist = ix[newhash];
-        if (newlist == undefined) {
+        if(newlist == undefined) {
-            ix[newhash] = newlist;
+          ix[newhash] = oldlist;
         } else {
-            ix[newhash] = oldlist.concat(newlist);
+          ix[newhash] = oldlist.concat(newlist);
         }
-        delete ix[oldhash];    
+        delete ix[oldhash];
-    }
+      }
-    
+
-    // the canonical one carries all the indexes
+      // the canonical one carries all the indexes
-    for (var i=0; i<4; i++) {
+    for(var i = 0; i < 4; i++) {
-        moveIndex(this.index[i]);
+      moveIndex(this.index[i]);
     }
 
     this.redirections[oldhash] = small;
-    if (big.uri) {
+    if(big.uri) {
-	if (this.aliases[newhash] == undefined)
+      //@@JAMBO: must update redirections,aliases from sub-items, too.
-	     this.aliases[newhash] = [];
+      if(this.aliases[newhash] == undefined)
-	this.aliases[newhash].push(big); // Back link
+        this.aliases[newhash] = [];
+      this.aliases[newhash].push(big); // Back link
+      if(this.aliases[oldhash]) {
+        for(var i = 0; i < this.aliases[oldhash].length; i++) {
+          this.redirections[this.aliases[oldhash][i].hashString()] = small;
+          this.aliases[newhash].push(this.aliases[oldhash][i]);
+        }
+      }
 
-	this.add(small, this.sym('http://www.w3.org/2006/link#uri'), big.uri)
+      //this.add(small, this.sym('http://www.w3.org/2007/ont/link#uri'), big.uri)
 
-	// If two things are equal, and one is requested, we should request the other.
+      // If two things are equal, and one is requested, we should request the other.
-	if (this.sf) {
+      if(this.sf) {
-	    this.sf.nowKnownAs(big, small)
+        this.sf.nowKnownAs(big, small)
-	}
+      }
-    
     }
-    
+
     moveIndex(this.classActions);
     moveIndex(this.propertyActions);
 
-    tabulator.log.debug("Equate done. "+big+" to be known as "+small)    
+    $rdf.log.debug("Equate done. "+big+" now links to "+small)    
-    return true;  // true means the statement does not need to be put in
+    return true; // true means the statement does not need to be put in
-};
+  };
 
-// Return the symbol with canonical URI as smushed
+  // Return the symbol with canonical URI as smushed
-RDFIndexedFormula.prototype.canon = function(term) {
+  $rdf.IndexedFormula.prototype.canon = function (term) {
-    if (term == undefined) return term;
+    if(term == undefined) return term;
     var y = this.redirections[term.hashString()];
-    if (y == undefined) return term;
+    if(y == undefined) return term;
     return y;
-}
+  }
 
-// Compare by canonical URI as smushed
+  // Compare by canonical URI as smushed
-RDFIndexedFormula.prototype.sameThings = function(x, y) {
+  $rdf.IndexedFormula.prototype.sameThings = function (x, y) {
-    if (x.sameTerm(y)) return true;
+    if(x.sameTerm(y)) return true;
     var x1 = this.canon(x);
-//    alert('x1='+x1);
+    //    alert('x1='+x1);
-    if (x1 == undefined) return false;
+    if(x1 == undefined) return false;
     var y1 = this.canon(y);
-//    alert('y1='+y1); //@@
+    //    alert('y1='+y1); //@@
-    if (y1 == undefined) return false;
+    if(y1 == undefined) return false;
-    return (x1.uri == y1.uri);
+    return(x1.uri == y1.uri);
-}
+  }
 
-// A list of all the URIs by which this thing is known
+  // A list of all the URIs by which this thing is known
-RDFIndexedFormula.prototype.uris = function(term) {
+  $rdf.IndexedFormula.prototype.uris = function (term) {
     var cterm = this.canon(term)
     var terms = this.aliases[cterm.hashString()];
-    if (!cterm.uri) return []
+    if(!cterm.uri) return []
-    var res = [ cterm.uri ]
+    var res = [cterm.uri]
-    if (terms != undefined) {
+    if(terms != undefined) {
-	for (var i=0; i<terms.length; i++) {
+      for(var i = 0; i < terms.length; i++) {
-	    res.push(terms[i].uri)
+        res.push(terms[i].uri)
-	}
+      }
     }
     return res
-}
+  }
 
-// On input parameters, convert constants to terms
+  // On input parameters, convert constants to terms
-// 
+  // 
-function RDFMakeTerm(formula,val, canonicalize) {
+  function RDFMakeTerm(formula, val, canonicalize) {
-    if (typeof val != 'object') {   
+    if(typeof val != 'object') {
-	if (typeof val == 'string')
+      if(typeof val == 'string')
-	    return new RDFLiteral(val);
+        return new $rdf.Literal(val);
-        if (typeof val == 'number')
+      if(typeof val == 'number')
-            return new RDFLiteral(val); // @@ differet types
+        return new $rdf.Literal(val); // @@ differet types
-        if (typeof val == 'boolean')
+      if(typeof val == 'boolean')
-            return new RDFLiteral(val?"1":"0", undefined, 
+        return new $rdf.Literal(val ? "1" : "0", undefined, $rdf.Symbol.prototype.XSDboolean);
-                                            RDFSymbol.prototype.XSDboolean);
+      if(typeof val == 'undefined')
-	else if (typeof val == 'number')
+        return undefined;
-	    return new RDFLiteral(''+val);   // @@ datatypes
+      else // @@ add converting of dates and numbers
-	else if (typeof val == 'undefined')
+      throw "Can't make Term from " + val + " of type " + typeof val;
-	    return undefined;
-	else    // @@ add converting of dates and numbers
-	    throw "Can't make Term from " + val + " of type " + typeof val; 
     }
     return val;
-}
+  }
 
-// add a triple to the store
+  // Add a triple to the store
-RDFIndexedFormula.prototype.add = function(subj, pred, obj, why) {
+  //
+  //  Returns the statement added
+  // (would it be better to return the original formula for chaining?)
+  //
+  $rdf.IndexedFormula.prototype.add = function (subj, pred, obj, why) {
     var actions, st;
-    if (why == undefined) why = this.fetcher ? this.fetcher.appNode: kb.sym("chrome:theSession"); //system generated
+    if(why == undefined) why = this.fetcher ? this.fetcher.appNode : this.sym("chrome:theSession"); //system generated
-                               //defined in source.js, is this OK with identity.js only user?
+    //defined in source.js, is this OK with identity.js only user?
     subj = RDFMakeTerm(this, subj);
     pred = RDFMakeTerm(this, pred);
     obj = RDFMakeTerm(this, obj);
     why = RDFMakeTerm(this, why);
-    
-    var hash = [ this.canon(subj).hashString(), this.canon(pred).hashString(),
-            this.canon(obj).hashString(), this.canon(why).hashString()];
 
-/*    // Removed TimBL 2007-01-06
+    if(this.predicateCallback != undefined)
-    // Check we don't already know it -- esp when working with dbview
+      this.predicateCallback(this, pred, why);
-    // db view has many documents with the same triple - a waste.
+
-    // but is we want to be able to edit documents, we must maintain the original
-    // triples from each one.  We might occasionally want to mutiple provences too
-    // for a full Truth Management System.  Maybe this should be run-time option.
-    st = this.anyStatementMatching(subj,pred,obj) // @@@@@@@ temp fix <====WATCH OUT!
-    It is general necessary to know when data has come from >1 place.
-    Maybe this should be a mode?
-*/
-    // This is wasting time and shouldn't happen at all
-    //st = this.anyStatementMatching(subj,pred,obj,why) // Avoid duplicates
-    //if (st != undefined) return; // already in store
- 
-    
-       
-    //    tabulator.log.debug("\nActions for "+s+" "+p+" "+o+". size="+this.statements.length)
-    if (this.predicateCallback != undefined)
-	this.predicateCallback(this, pred, why);
-	
     // Action return true if the statement does not need to be added
-    var actions = this.propertyActions[hash[1]]; // Predicate hash
+    var actions = this.propertyActions[this.canon(pred).hashString()];
     var done = false;
-    if (actions) {
+    if(actions) {
-        // alert('type: '+typeof actions +' @@ actions='+actions);
+      // alert('type: '+typeof actions +' @@ actions='+actions);
-        for (var i=0; i<actions.length; i++) {
+      for(var i = 0; i < actions.length; i++) {
-            done = done || actions[i](this, subj, pred, obj, why);
+        done = done || actions[i](this, subj, pred, obj, why);
-        }
+      }
     }
-    
+
     //If we are tracking provenanance, every thing should be loaded into the store
-    //if (done) return new RDFStatement(subj, pred, obj, why); // Don't put it in the store
+    //if (done) return new Statement(subj, pred, obj, why); // Don't put it in the store
-                                                             // still return this statement for owl:sameAs input
+    // still return this statement for owl:sameAs input
-    var st = new RDFStatement(subj, pred, obj, why);
+    var hash = [this.canon(subj).hashString(), this.canon(pred).hashString(),
-    for (var i=0; i<4; i++) {
+                   this.canon(obj).hashString(), this.canon(why).hashString()];
-        var ix = this.index[i];
+    var st = new $rdf.Statement(subj, pred, obj, why);
-        var h = hash[i];
+    for(var i = 0; i < 4; i++) {
-        if (ix[h] == undefined) ix[h] = [];
+      var ix = this.index[i];
-        ix[h].push(st); // Set of things with this as subject
+      var h = hash[i];
+      if(ix[h] == undefined) ix[h] = [];
+      ix[h].push(st); // Set of things with this as subject, etc
     }
-    
+
-    tabulator.log.debug("ADDING    {"+subj+" "+pred+" "+obj+"} "+why);
+    //tabulator.log.debug("ADDING    {"+subj+" "+pred+" "+obj+"} "+why);
     this.statements.push(st);
     return st;
-}; //add
+  }; //add
-
+  // Find out whether a given URI is used as symbol in the formula
-
+  $rdf.IndexedFormula.prototype.mentionsURI = function (uri) {
-// Find out whether a given URI is used as symbol in the formula
-RDFIndexedFormula.prototype.mentionsURI = function(uri) {
     var hash = '<' + uri + '>';
-    return (!!this.subjectIndex[hash] || !!this.objectIndex[hash]
+    return (!!this.subjectIndex[hash]
-            || !!this.predicateIndex[hash]);
+      || !!this.objectIndex[hash]
-}
+      || !!this.predicateIndex[hash]);
+  }
 
-// Find an unused id for a file being edited: return a symbol
+  // Find an unused id for a file being edited: return a symbol
-// (Note: Slow iff a lot of them -- could be O(log(k)) )
+  // (Note: Slow iff a lot of them -- could be O(log(k)) )
-RDFIndexedFormula.prototype.nextSymbol = function(doc) {
+  $rdf.IndexedFormula.prototype.nextSymbol = function (doc) {
-    for(var i=0;;i++) {
+    for(var i = 0;; i++) {
-        var uri = doc.uri + '#n' + i;
+      var uri = doc.uri + '#n' + i;
-        if (!this.mentionsURI(uri)) return kb.sym(uri);
+      if(!this.mentionsURI(uri)) return this.sym(uri);
     }
-}
+  }
 
 
-RDFIndexedFormula.prototype.anyStatementMatching = function(subj,pred,obj,why) {
+  $rdf.IndexedFormula.prototype.anyStatementMatching = function (subj, pred, obj, why) {
-    var x = this.statementsMatching(subj,pred,obj,why,true);
+    var x = this.statementsMatching(subj, pred, obj, why, true);
-    if (!x || x == []) return undefined;
+    if(!x || x == []) return undefined;
     return x[0];
-};
+  };
 
 
-// Return statements matching a pattern
+  // Return statements matching a pattern
-// ALL CONVENIENCE LOOKUP FUNCTIONS RELY ON THIS!
+  // ALL CONVENIENCE LOOKUP FUNCTIONS RELY ON THIS!
-RDFIndexedFormula.prototype.statementsMatching = function(subj,pred,obj,why,justOne) {
+  $rdf.IndexedFormula.prototype.statementsMatching = function (subj, pred, obj, why, justOne) {
-    tabulator.log.debug("Matching {"+subj+" "+pred+" "+obj+"}");
+    //$rdf.log.debug("Matching {"+subj+" "+pred+" "+obj+"}");
-    
+    var pat = [subj, pred, obj, why];
-    var pat = [ subj, pred, obj, why ];
     var pattern = [];
     var hash = [];
     var wild = []; // wildcards
     var given = []; // Not wild
-    for (var p=0; p<4; p++) {
+    for(var p = 0; p < 4; p++) {
-        pattern[p] = this.canon(RDFMakeTerm(this, pat[p]));
+      pattern[p] = this.canon(RDFMakeTerm(this, pat[p]));
-        if (pattern[p] == undefined) {
+      if(pattern[p] == undefined) {
-            wild.push(p);
+        wild.push(p);
-        } else {
+      } else {
-            given.push(p);
+        given.push(p);
-            hash[p] = pattern[p].hashString();
+        hash[p] = pattern[p].hashString();
-        }
+      }
     }
-    if (given.length == 0) return this.statements; // Easy
+    if(given.length == 0) {
-    if (given.length == 1) {  // Easy too, we have an index for that
+      return this.statements;
-        var p = given[0];
-        var list = this.index[p][hash[p]];
-        return list == undefined ? [] : list;
     }
-    
+    if(given.length == 1) { // Easy too, we have an index for that
+      var p = given[0];
+      var list = this.index[p][hash[p]];
+      if(list && justOne) {
+        if(list.length > 1)
+          list = list.slice(0, 1);
+      }
+      return list == undefined ? [] : list;
+    }
+
     // Now given.length is 2, 3 or 4.
     // We hope that the scale-free nature of the data will mean we tend to get
     // a short index in there somewhere!
-    
     var best = 1e10; // really bad
     var best_i;
-    for (var i=0; i<given.length; i++) {
+    for(var i = 0; i < given.length; i++) {
-        var p = given[i]; // Which part we are dealing with
+      var p = given[i]; // Which part we are dealing with
-        var list = this.index[p][hash[p]];
+      var list = this.index[p][hash[p]];
-        if (list == undefined) return []; // No occurrences
+      if(list == undefined) return []; // No occurrences
-        if (list.length < best) {
+      if(list.length < best) {
-            best = list.length;
+        best = list.length;
-            best_i = i;  // (not p!)
+        best_i = i; // (not p!)
-        }
+      }
     }
-    
+
     // Ok, we have picked the shortest index but now we have to filter it
     var best_p = given[best_i];
     var possibles = this.index[best_p][hash[best_p]];
-    var check = given.slice(0, best_i).concat(given.slice(best_i+1)) // remove best_i
+    var check = given.slice(0, best_i).concat(given.slice(best_i + 1)) // remove best_i
     var results = [];
-    var parts = [ 'subject', 'predicate', 'object', 'why'];
+    var parts = ['subject', 'predicate', 'object', 'why'];
-    for (var j=0; j<possibles.length; j++) {
+    for(var j = 0; j < possibles.length; j++) {
-        var st = possibles[j];
+      var st = possibles[j];
-        for (var i=0; i <check.length; i++) { // for each position to be checked
+      for(var i = 0; i < check.length; i++) { // for each position to be checked
-            var p = check[i];
+        var p = check[i];
-            if (!this.canon(st[parts[p]]).sameTerm(pattern[p])) {
+        if(!this.canon(st[parts[p]]).sameTerm(pattern[p])) {
-                st = null; 
+          st = null;
-                break;
+          break;
-            }
         }
-        if (st != null) results.push(st);
+      }
+      if(st != null) {
+        results.push(st);
+        if(justOne)
+          break;
+      }
     }
     return results;
-}; // statementsMatching
+  }; // statementsMatching
-
+  /** remove a particular statement from the bank **/
-
+  $rdf.IndexedFormula.prototype.remove = function (st) {
-/** remove a particular statement from the bank **/
+    //$rdf.log.debug("entering remove w/ st=" + st);
-RDFIndexedFormula.prototype.remove = function (st) {
+    var term = [st.subject, st.predicate, st.object, st.why];
-    tabulator.log.debug("entering remove w/ st=" + st);
+    for(var p = 0; p < 4; p++) {
-    var term = [ st.subject, st.predicate, st.object, st.why];
+      var c = this.canon(term[p]);
-    for (var p=0; p<4; p++) {
+      var h = c.hashString();
-        var c = this.canon(term[p]);
+      if(this.index[p][h] == undefined) {
-        var h = c.hashString();
+        //$rdf.log.warn ("Statement removal: no index '+p+': "+st);
-        if (this.index[p][h] == undefined) {
+      } else {
-            tabulator.log.warn ("Statement removal: no index '+p+': "+st);
+        $rdf.Util.RDFArrayRemove(this.index[p][h], st);
-        } else {
+      }
-            RDFArrayRemove(this.index[p][h], st);
-        }
     }
-    RDFArrayRemove(this.statements, st);
+    $rdf.Util.RDFArrayRemove(this.statements, st);
-}; //remove
+  }; //remove
-
+  /** remove all statements matching args (within limit) **/
-/** remove all statements matching args (within limit) **/
+  $rdf.IndexedFormula.prototype.removeMany = function (subj, pred, obj, why, limit) {
-RDFIndexedFormula.prototype.removeMany = function (subj, pred, obj, why, limit) {
+    //$rdf.log.debug("entering removeMany w/ subj,pred,obj,why,limit = " + subj +", "+ pred+", " + obj+", " + why+", " + limit);
-    tabulator.log.debug("entering removeMany w/ subj,pred,obj,why,limit = " + subj +", "+ pred+", " + obj+", " + why+", " + limit);
+    var sts = this.statementsMatching(subj, pred, obj, why, false);
-    var sts = this.statementsMatching (subj, pred, obj, why, false);
     //This is a subtle bug that occcured in updateCenter.js too.
     //The fact is, this.statementsMatching returns this.whyIndex instead of a copy of it
     //but for perfromance consideration, it's better to just do that
     //so make a copy here.
     var statements = [];
-    for (var i=0;i<sts.length;i++) statements.push(sts[i]);
+    for(var i = 0; i < sts.length; i++) statements.push(sts[i]);
-    if (limit) statements = statements.slice(0, limit);
+    if(limit) statements = statements.slice(0, limit);
-    for (var st in statements) this.remove(statements[st]);
+    for(var i = 0; i < statements.length; i++) this.remove(statements[i]);
-}; //removeMany
+  }; //removeMany
+  /** Utility**/
 
-/** Load a resorce into the store **/
+  /*  @method: copyTo
-
+    @description: replace @template with @target and add appropriate triples (no triple removed)
-RDFIndexedFormula.prototype.load = function(url) {
-    // get the XML
-    var xhr = Util.XMLHTTPFactory(); // returns a new XMLHttpRequest, or ActiveX XMLHTTP object
-    if (xhr.overrideMimeType) {
-	xhr.overrideMimeType("text/xml");
-    }
-
-    // Get privileges for cross-domain web access
-    if(!isExtension) {
-        try {
-            Util.enablePrivilege("UniversalXPConnect UniversalBrowserRead")
-        } catch(e) {
-            throw ("Failed to get privileges: (see http://dig.csail.mit.edu/2005/ajar/ajaw/Privileges.html)" + e)
-        }
-    }
-
-    xhr.open("GET", url, false);  // Synchronous
-    xhr.send("");
-
-    // Get XML DOM Tree
-
-    var nodeTree = xhr.responseXML;
-    if (nodeTree === null && xhr.responseText !== null) {
-	// Only if the server fails to set Content-Type: text/xml AND xmlhttprequest doesn't have the overrideMimeType method
-	nodeTree = (new DOMParser()).parseFromString(xhr.responseText, 'text/xml');
-    }
-
-    // Get RDF statements fromm XML
-
-    // must be an XML document node tree
-    var parser = new RDFParser(this);
-    parser.parse(nodeTree,url);
-}
-
-
-/** Utility**/
-
-/*  @method: copyTo
-    @discription: replace @template with @target and add appropriate triples (no triple removed)
                   one-direction replication 
-*/ 
+*/
-RDFIndexedFormula.prototype.copyTo = function(template,target,flags){
+  $rdf.IndexedFormula.prototype.copyTo = function (template, target, flags) {
-    if (!flags) flags=[];
+    if(!flags) flags = [];
-    var statList=this.statementsMatching(template);
+    var statList = this.statementsMatching(template);
-    if (flags.indexOf('two-direction')!=-1) 
+    if($rdf.Util.ArrayIndexOf(flags, 'two-direction') != -1)
-        statList.concat(this.statementsMatching(undefined,undefined,template));
+      statList.concat(this.statementsMatching(undefined, undefined, template));
-    for (var i=0;i<statList.length;i++){
+    for(var i = 0; i < statList.length; i++) {
-        var st=statList[i];
+      var st = statList[i];
-        switch (st.object.termType){
+      switch(st.object.termType) {
-            case 'symbol':
+      case 'symbol':
-                this.add(target,st.predicate,st.object);
+        this.add(target, st.predicate, st.object);
-                break;
+        break;
-            case 'literal':
+      case 'literal':
-            case 'bnode':
+      case 'bnode':
-            case 'collection':
+      case 'collection':
-                this.add(target,st.predicate,st.object.copy(this));
+        this.add(target, st.predicate, st.object.copy(this));
-        }
+      }
-        if (flags.indexOf('delete')!=-1) this.remove(st);
+      if($rdf.Util.ArrayIndexOf(flags, 'delete') != -1) this.remove(st);
     }
-};
+  };
-//for the case when you alter this.value (text modified in userinput.js)
+  //for the case when you alter this.value (text modified in userinput.js)
-RDFLiteral.prototype.copy = function(){ 
+  $rdf.Literal.prototype.copy = function () {
-    return new RDFLiteral(this.value,this.lang,this.datatype);
+    return new $rdf.Literal(this.value, this.lang, this.datatype);
-};
+  };
-RDFBlankNode.prototype.copy = function(formula){ //depends on the formula
+  $rdf.BlankNode.prototype.copy = function (formula) { //depends on the formula
-    var bnodeNew=new RDFBlankNode();
+    var bnodeNew = new $rdf.BlankNode();
-    formula.copyTo(this,bnodeNew);
+    formula.copyTo(this, bnodeNew);
     return bnodeNew;
-}
+  }
-/**  Full N3 bits  -- placeholders only to allow parsing, no functionality! **/
+  /**  Full N3 bits  -- placeholders only to allow parsing, no functionality! **/
 
-RDFIndexedFormula.prototype.newUniversal = function(uri) {
+  $rdf.IndexedFormula.prototype.newUniversal = function (uri) {
     var x = this.sym(uri);
-    if (!this._universalVariables) this._universalVariables = [];
+    if(!this._universalVariables) this._universalVariables = [];
     this._universalVariables.push(x);
     return x;
-}
+  }
 
-RDFIndexedFormula.prototype.newExistential = function(uri) {
+  $rdf.IndexedFormula.prototype.newExistential = function (uri) {
-    if (!uri) return this.bnode();
+    if(!uri) return this.bnode();
     var x = this.sym(uri);
     return this.declareExistential(x);
-}
+  }
 
-RDFIndexedFormula.prototype.declareExistential = function(x) {
+  $rdf.IndexedFormula.prototype.declareExistential = function (x) {
-    if (!this._existentialVariables) this._existentialVariables = [];
+    if(!this._existentialVariables) this._existentialVariables = [];
     this._existentialVariables.push(x);
     return x;
-}
+  }
 
-RDFIndexedFormula.prototype.formula = function(features) {
+  $rdf.IndexedFormula.prototype.formula = function (features) {
-    return new RDFIndexedFormula(features);
+    return new $rdf.IndexedFormula(features);
-}
+  }
 
-RDFIndexedFormula.prototype.close = function() {
+  $rdf.IndexedFormula.prototype.close = function () {
     return this;
-}
+  }
 
-RDFIndexedFormula.prototype.hashString = RDFIndexedFormula.prototype.toNT;
+  $rdf.IndexedFormula.prototype.hashString = $rdf.IndexedFormula.prototype.toNT;
 
-/////////////////////////////  Provenance tracking
+  return $rdf.IndexedFormula;
-//  
-// Where did this statement come from?
-//
-
-/*
-RDFStatement.prototype.original = function() {
-    for (var st = this;; st = st.why.premis[0]) {
-        if (st.why.termType && st.why.termType== 'symbol')
-            return this; // This statement came from a document
-    }
-}
-*/
-
-
-
-// ends
 
+}();
+// ends

chrome/content/zotero/xpcom/rdf/init.js

@@ -0,0 +1,33 @@
+/* Set up the environment before loading the rest of the files into Zotero */
+var $rdf = {
+	Util: {
+		ArrayIndexOf: function (arr, item, i) {
+			//supported in all browsers except IE<9
+			return arr.indexOf(item, i);
+		},
+		RDFArrayRemove: function (a, x) { //removes all statements equal to x from a
+			for (var i = 0; i < a.length; i++) {
+				//TODO: This used to be the following, which didnt always work..why
+				//if(a[i] == x)
+				if (a[i].subject.sameTerm(x.subject) && a[i].predicate.sameTerm(x.predicate) && a[i].object.sameTerm(x.object) && a[i].why.sameTerm(x.why)) {
+					a.splice(i, 1);
+					return;
+				}
+			}
+			throw "RDFArrayRemove: Array did not contain " + x;
+		}
+	},
+	log: {
+		debug: Zotero.debug,
+		warn: Zotero.debug
+	}
+};
+
+if(Zotero.RDF) {
+	Zotero.RDF.AJAW = $rdf;
+} else {
+	Zotero.RDF = {AJAW:$rdf};
+}
+
+var tabulator = {log: $rdf.log};
+var alert = $rdf.log.warn;

chrome/content/zotero/xpcom/rdf/match.js

@@ -5,76 +5,42 @@
 //
 // We retpresent a set as an associative array whose value for
 // each member is set to true.
-
+$rdf.Symbol.prototype.sameTerm = function (other) {
-/* Not used, bogus. See identity.js for the ones really used.
+  if(!other) {
-RDFFormula.prototype.statementsMatching = function(s,p,o,w) {
+    return false
-    var results = []
+  }
-    var i
+  return((this.termType == other.termType) && (this.uri == other.uri))
-    var ls = this.statements.length
-    for (i=0; i<ls; i++) {
-	var st = this.statements[i]
-	if (RDFTermMatch(p, st.predicate) &&  // first as simplest
-	    RDFTermMatch(s, st.subject) &&
-	    RDFTermMatch(o, st.object) &&
-	    RDFTermMatch(w, st.why)) {
-		results[st] = true          @@@@ sould use numeric indexed array
-	}
-	    
-    }
-    return results
 }
 
-RDFFormula.prototype.anyStatementMatching = function(s,p,o,w) {
+$rdf.BlankNode.prototype.sameTerm = function (other) {
-    var ls = this.statements.length
+  if(!other) {
-    var i
+    return false
-    for (i=0; i<ls; i++) {
+  }
-	var st = this.statements[i]
+  return((this.termType == other.termType) && (this.id == other.id))
-	if (RDFTermMatch(p, st.predicate) &&  // first as simplest
-	    RDFTermMatch(s, st.subject) &&
-	    RDFTermMatch(o, st.object) &&
-	    RDFTermMatch(w, st.why)) {
-		return st
-	}
-	    
-    }
-    return undefined
 }
 
-*/
+$rdf.Literal.prototype.sameTerm = function (other) {
-
+  if(!other) {
-function RDFTermMatch(pattern, term) {
+    return false
-    if (typeof pattern == 'undefined') return true;
+  }
-    return pattern.sameTerm(term)
+  return((this.termType == other.termType)
+    && (this.value == other.value)
+    && (this.lang == other.lang)
+    && ((!this.datatype && !other.datatype)
+      || (this.datatype && this.datatype.sameTerm(other.datatype))))
 }
 
-RDFSymbol.prototype.sameTerm = function(other) {
+$rdf.Variable.prototype.sameTerm = function (other) {
-    if (!other) { return false }
+  if(!other) {
-    return ((this.termType == other.termType) && (this.uri == other.uri))
+    return false
+  }
+  return((this.termType == other.termType) && (this.uri == other.uri))
 }
 
-RDFBlankNode.prototype.sameTerm = function(other) {
+$rdf.Collection.prototype.sameTerm = $rdf.BlankNode.prototype.sameTerm
-    if (!other) { return false }
-    return ((this.termType == other.termType) && (this.id == other.id))
-}
 
-RDFLiteral.prototype.sameTerm = function(other) {
+$rdf.Formula.prototype.sameTerm = function (other) {
-    if (!other) { return false }
+  return this.hashString() == other.hashString();
-    return ((this.termType == other.termType)
-	    && (this.value == other.value)
-	    && (this.lang == other.lang) &&
-	    ((!this.datatype && !other.datatype)
-	     || this.datatype.sameTerm(other.datatype)))
-}
-
-RDFVariable.prototype.sameTerm = function (other) {
-    if (!other) { return false }
-    return((this.termType == other.termType) && (this.uri == other.uri))
-}
-
-RDFCollection.prototype.sameTerm = RDFBlankNode.prototype.sameTerm
-
-RDFFormula.prototype.sameTerm = function (other) {
-    return this.hashString() == other.hashString();
 }
 //  Comparison for ordering
 //
@@ -84,95 +50,95 @@ RDFFormula.prototype.sameTerm = function (other) {
 // When we smush nodes we take the lowest value. This is not
 // arbitrary: we want the value actually used to be the literal
 // (or list or formula). 
-
+$rdf.Literal.prototype.classOrder = 1
-RDFLiteral.prototype.classOrder = 1
+$rdf.Collection.prototype.classOrder = 3
-// RDFList.prototype.classOrder = 2
+$rdf.Formula.prototype.classOrder = 4
-// RDFSet.prototype.classOrder = 3
+$rdf.Symbol.prototype.classOrder = 5
-RDFCollection.prototype.classOrder = 3
+$rdf.BlankNode.prototype.classOrder = 6
-RDFFormula.prototype.classOrder = 4
-RDFSymbol.prototype.classOrder = 5
-RDFBlankNode.prototype.classOrder = 6
 
 //  Compaisons return  sign(self - other)
 //  Literals must come out before terms for smushing
+$rdf.Literal.prototype.compareTerm = function (other) {
+  if(this.classOrder < other.classOrder) return -1
+  if(this.classOrder > other.classOrder) return +1
+  if(this.value < other.value) return -1
+  if(this.value > other.value) return +1
+  return 0
+}
 
-RDFLiteral.prototype.compareTerm = function(other) {
+$rdf.Symbol.prototype.compareTerm = function (other) {
-    if (this.classOrder < other.classOrder) return -1
+  if(this.classOrder < other.classOrder) return -1
-    if (this.classOrder > other.classOrder) return +1
+  if(this.classOrder > other.classOrder) return +1
-    if (this.value < other.value) return -1
+  if(this.uri < other.uri) return -1
-    if (this.value > other.value) return +1
+  if(this.uri > other.uri) return +1
-    return 0
+  return 0
-} 
+}
 
-RDFSymbol.prototype.compareTerm = function(other) {
+$rdf.BlankNode.prototype.compareTerm = function (other) {
-    if (this.classOrder < other.classOrder) return -1
+  if(this.classOrder < other.classOrder) return -1
-    if (this.classOrder > other.classOrder) return +1
+  if(this.classOrder > other.classOrder) return +1
-    if (this.uri < other.uri) return -1
+  if(this.id < other.id) return -1
-    if (this.uri > other.uri) return +1
+  if(this.id > other.id) return +1
-    return 0
+  return 0
-} 
+}
 
-RDFBlankNode.prototype.compareTerm = function(other) {
+$rdf.Collection.prototype.compareTerm = $rdf.BlankNode.prototype.compareTerm
-    if (this.classOrder < other.classOrder) return -1
-    if (this.classOrder > other.classOrder) return +1
-    if (this.id < other.id) return -1
-    if (this.id > other.id) return +1
-    return 0
-} 
-
-RDFCollection.prototype.compareTerm = RDFBlankNode.prototype.compareTerm
 
 //  Convenience routines
-
 // Only one of s p o can be undefined, and w is optional.
-RDFFormula.prototype.each = function(s,p,o,w) {
+$rdf.Formula.prototype.each = function (s, p, o, w) {
-    var results = []
+  var results = []
-    var st, sts = this.statementsMatching(s,p,o,w)
+  var st, sts = this.statementsMatching(s, p, o, w, false)
-    var i, n=sts.length
+  var i, n = sts.length
-    if (typeof s == 'undefined') {
+  if(typeof s == 'undefined') {
-	for (i=0; i<n; i++) {st=sts[i]; results.push(st.subject)}
+    for(i = 0; i < n; i++) {
-    } else if (typeof p == 'undefined') {
+      st = sts[i];
-	for (i=0; i<n; i++) {st=sts[i]; results.push(st.predicate)}
+      results.push(st.subject)
-    } else if (typeof o == 'undefined') {
-	for (i=0; i<n; i++) {st=sts[i]; results.push(st.object)}
-    } else if (typeof w == 'undefined') {
-	for (i=0; i<n; i++) {st=sts[i]; results.push(st.why)}
     }
-    return results
+  } else if(typeof p == 'undefined') {
+    for(i = 0; i < n; i++) {
+      st = sts[i];
+      results.push(st.predicate)
+    }
+  } else if(typeof o == 'undefined') {
+    for(i = 0; i < n; i++) {
+      st = sts[i];
+      results.push(st.object)
+    }
+  } else if(typeof w == 'undefined') {
+    for(i = 0; i < n; i++) {
+      st = sts[i];
+      results.push(st.why)
+    }
+  }
+  return results
 }
 
-RDFFormula.prototype.any = function(s,p,o,w) {
+$rdf.Formula.prototype.any = function (s, p, o, w) {
-    var st = this.anyStatementMatching(s,p,o,w)
+  var st = this.anyStatementMatching(s, p, o, w)
-    if (typeof st == 'undefined') return undefined;
+  if(typeof st == 'undefined') return undefined;
-    
-    if (typeof s == 'undefined') return st.subject;
-    if (typeof p == 'undefined') return st.predicate;
-    if (typeof o == 'undefined') return st.object;
 
-    return undefined
+  if(typeof s == 'undefined') return st.subject;
+  if(typeof p == 'undefined') return st.predicate;
+  if(typeof o == 'undefined') return st.object;
+
+  return undefined
 }
 
-RDFFormula.prototype.the = function(s,p,o,w) {
+$rdf.Formula.prototype.holds = function (s, p, o, w) {
-    // the() should contain a check there is only one
+  var st = this.anyStatementMatching(s, p, o, w)
-    var x = this.any(s,p,o,w)
+  if(typeof st == 'undefined') return false;
-    if (typeof x == 'undefined')
+  return true;
-	tabulator.log.error("No value found for the(){" + s + " " + p + " " + o + "}.")
-    return x
 }
 
-RDFFormula.prototype.whether = function(s,p,o,w) {
+$rdf.Formula.prototype.the = function (s, p, o, w) {
-    return this.statementsMatching(s,p,o,w).length;
+  // the() should contain a check there is only one
+  var x = this.any(s, p, o, w)
+  if(typeof x == 'undefined')
+    $rdf.log.error("No value found for the(){" + s + " " + p + " " + o + "}.")
+  return x
 }
- 
+
-// Not a method. For use in sorts
+$rdf.Formula.prototype.whether = function (s, p, o, w) {
-function RDFComparePredicateObject(self, other) {
+  return this.statementsMatching(s, p, o, w, false).length;
-    var x = self.predicate.compareTerm(other.predicate)
+}
-    if (x !=0) return x
-    return self.object.compareTerm(other.object)
-}
-function RDFComparePredicateSubject(self, other) {
-    var x = self.predicate.compareTerm(other.predicate)
-    if (x !=0) return x
-    return self.subject.compareTerm(other.subject)
-}
-// ends

chrome/content/zotero/xpcom/rdf/rdfparser.js

@@ -61,502 +61,504 @@
  * @constructor
  * @param {RDFStore} store An RDFStore object
  */
-function RDFParser(store) {
+$rdf.RDFParser = function (store) {
-    /** Standard namespaces that we know how to handle @final
+  var RDFParser = {};
-     *  @member RDFParser
-     */
-    RDFParser['ns'] = {'RDF':
-		       "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
-		       'RDFS':
-		       "http://www.w3.org/2000/01/rdf-schema#"}
-    /** DOM Level 2 node type magic numbers @final
-     *  @member RDFParser
-     */
-    RDFParser['nodeType'] = {'ELEMENT': 1, 'ATTRIBUTE': 2, 'TEXT': 3,
-			     'CDATA_SECTION': 4, 'ENTITY_REFERENCE': 5,
-			     'ENTITY': 6, 'PROCESSING_INSTRUCTION': 7,
-			     'COMMENT': 8, 'DOCUMENT': 9, 'DOCUMENT_TYPE': 10,
-			     'DOCUMENT_FRAGMENT': 11, 'NOTATION': 12}
 
-    /**
+  /** Standard namespaces that we know how to handle @final
-     * Frame class for namespace and base URI lookups
+   *  @member RDFParser
-     * Base lookups will always resolve because the parser knows
+   */
-     * the default base.
+  RDFParser['ns'] = {
-     *
+    'RDF': "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
-     * @private
+    'RDFS': "http://www.w3.org/2000/01/rdf-schema#"
-     */
+  }
-    this['frameFactory'] = function (parser, parent, element) {
+  /** DOM Level 2 node type magic numbers @final
-	return {'NODE': 1,
+   *  @member RDFParser
-		'ARC': 2,
+   */
-		'parent': parent,
+  RDFParser['nodeType'] = {
-		'parser': parser,
+    'ELEMENT': 1,
-		'store': parser['store'],
+    'ATTRIBUTE': 2,
-		'element': element,
+    'TEXT': 3,
-		'lastChild': 0,
+    'CDATA_SECTION': 4,
-		'base': null,
+    'ENTITY_REFERENCE': 5,
-		'lang': null,
+    'ENTITY': 6,
-		'node': null,
+    'PROCESSING_INSTRUCTION': 7,
-		'nodeType': null,
+    'COMMENT': 8,
-		'listIndex': 1,
+    'DOCUMENT': 9,
-		'rdfid': null,
+    'DOCUMENT_TYPE': 10,
-		'datatype': null,
+    'DOCUMENT_FRAGMENT': 11,
-		'collection': false,
+    'NOTATION': 12
+  }
 
-	/** Terminate the frame and notify the store that we're done */
+  /**
-		'terminateFrame': function () {
+   * Frame class for namespace and base URI lookups
-		    if (this['collection']) {
+   * Base lookups will always resolve because the parser knows
-			this['node']['close']()
+   * the default base.
-		    }
+   *
-		},
+   * @private
-	
+   */
-	/** Add a symbol of a certain type to the this frame */
+  this['frameFactory'] = function (parser, parent, element) {
-		'addSymbol': function (type, uri) {
+    return {
-		    uri = Util.uri.join(uri, this['base'])
+      'NODE': 1,
-		    this['node'] = this['store']['sym'](uri)
+      'ARC': 2,
-		    this['nodeType'] = type
+      'parent': parent,
-		},
+      'parser': parser,
-	
+      'store': parser['store'],
-	/** Load any constructed triples into the store */
+      'element': element,
-		'loadTriple': function () {
+      'lastChild': 0,
-		    if (this['parent']['parent']['collection']) {
+      'base': null,
-			this['parent']['parent']['node']['append'](this['node'])
+      'lang': null,
-		    }
+      'node': null,
-		    else {
+      'nodeType': null,
-			this['store']['add'](this['parent']['parent']['node'],
+      'listIndex': 1,
-				       this['parent']['node'],
+      'rdfid': null,
-				       this['node'],
+      'datatype': null,
-				       this['parser']['why'])
+      'collection': false,
-		    }
-		    if (this['parent']['rdfid'] != null) { // reify
-			var triple = this['store']['sym'](
-			    Util.uri.join("#"+this['parent']['rdfid'],
-					  this['base']))
-			this['store']['add'](triple,
-					     this['store']['sym'](
-						 RDFParser['ns']['RDF']
-						     +"type"),
-					     this['store']['sym'](
-						 RDFParser['ns']['RDF']
-						     +"Statement"),
-					     this['parser']['why'])
-			this['store']['add'](triple,
-					     this['store']['sym'](
-						 RDFParser['ns']['RDF']
-						     +"subject"),
-					     this['parent']['parent']['node'],
-					     this['parser']['why'])
-			this['store']['add'](triple,
-					     this['store']['sym'](
-						 RDFParser['ns']['RDF']
-						     +"predicate"),
-					     this['parent']['node'],
-					     this['parser']['why'])
-			this['store']['add'](triple,
-					     this['store']['sym'](
-						 RDFParser['ns']['RDF']
-						     +"object"),
-					     this['node'],
-					     this['parser']['why'])
-		    }
-		},
 
-	/** Check if it's OK to load a triple */
+      /** Terminate the frame and notify the store that we're done */
-		'isTripleToLoad': function () {
+      'terminateFrame': function () {
-		    return (this['parent'] != null
+        if(this['collection']) {
-			    && this['parent']['parent'] != null
+          this['node']['close']()
-			    && this['nodeType'] == this['NODE']
+        }
-			    && this['parent']['nodeType'] == this['ARC']
+      },
-			    && this['parent']['parent']['nodeType']
-			    == this['NODE'])
-		},
 
-	/** Add a symbolic node to this frame */
+      /** Add a symbol of a certain type to the this frame */
-		'addNode': function (uri) {
+      'addSymbol': function (type, uri) {
-		    this['addSymbol'](this['NODE'],uri)
+        uri = $rdf.Util.uri.join(uri, this['base'])
-		    if (this['isTripleToLoad']()) {
+        this['node'] = this['store']['sym'](uri)
-			this['loadTriple']()
+        this['nodeType'] = type
-		    }
+      },
-		},
 
-	/** Add a collection node to this frame */
+      /** Load any constructed triples into the store */
-		'addCollection': function () {
+      'loadTriple': function () {
-		    this['nodeType'] = this['NODE']
+        if(this['parent']['parent']['collection']) {
-		    this['node'] = this['store']['collection']()
+          this['parent']['parent']['node']['append'](this['node'])
-		    this['collection'] = true
+        } else {
-		    if (this['isTripleToLoad']()) {
+          this['store']['add'](this['parent']['parent']['node'],
-			this['loadTriple']()
+            this['parent']['node'],
-		    }
+            this['node'],
-		},
+            this['parser']['why'])
+        }
+        if(this['parent']['rdfid'] != null) { // reify
+          var triple = this['store']['sym'](
+          $rdf.Util.uri.join("#" + this['parent']['rdfid'], this['base']))
+          this['store']['add'](triple,
+            this['store']['sym'](RDFParser['ns']['RDF'] + "type"),
+            this['store']['sym'](RDFParser['ns']['RDF'] + "Statement"),
+            this['parser']['why'])
+          this['store']['add'](triple,
+            this['store']['sym'](RDFParser['ns']['RDF'] + "subject"),
+            this['parent']['parent']['node'],
+            this['parser']['why'])
+          this['store']['add'](triple,
+            this['store']['sym'](RDFParser['ns']['RDF'] + "predicate"),
+            this['parent']['node'],
+            this['parser']['why'])
+          this['store']['add'](triple,
+            this['store']['sym'](RDFParser['ns']['RDF'] + "object"),
+            this['node'],
+            this['parser']['why'])
+        }
+      },
 
-	/** Add a collection arc to this frame */
+      /** Check if it's OK to load a triple */
-		'addCollectionArc': function () {
+      'isTripleToLoad': function () {
-		    this['nodeType'] = this['ARC']
+        return (this['parent'] != null
-		},
+          && this['parent']['parent'] != null
+          && this['nodeType'] == this['NODE']
+          && this['parent']['nodeType'] == this['ARC']
+          && this['parent']['parent']['nodeType'] == this['NODE'])
+      },
 
-	/** Add a bnode to this frame */
+      /** Add a symbolic node to this frame */
-		'addBNode': function (id) {
+      'addNode': function (uri) {
-		    if (id != null) {
+        this['addSymbol'](this['NODE'], uri)
-			if (this['parser']['bnodes'][id] != null) {
+        if(this['isTripleToLoad']()) {
-			    this['node'] = this['parser']['bnodes'][id]
+          this['loadTriple']()
-			} else {
+        }
-			    this['node'] = this['parser']['bnodes'][id] = this['store']['bnode']()
+      },
-			}
-		    } else { this['node'] = this['store']['bnode']() }
-		    
-		    this['nodeType'] = this['NODE']
-		    if (this['isTripleToLoad']()) {
-			this['loadTriple']()
-		    }
-		},
 
-	/** Add an arc or property to this frame */
+      /** Add a collection node to this frame */
-		'addArc': function (uri) {
+      'addCollection': function () {
-		    if (uri == RDFParser['ns']['RDF']+"li") {
+        this['nodeType'] = this['NODE']
-			uri = RDFParser['ns']['RDF']+"_"+this['parent']['listIndex']++
+        this['node'] = this['store']['collection']()
-		    }
+        this['collection'] = true
-		    this['addSymbol'](this['ARC'], uri)
+        if(this['isTripleToLoad']()) {
-		},
+          this['loadTriple']()
+        }
+      },
 
-	/** Add a literal to this frame */
+      /** Add a collection arc to this frame */
-		'addLiteral': function (value) {
+      'addCollectionArc': function () {
-		    if (this['parent']['datatype']) {
+        this['nodeType'] = this['ARC']
-			this['node'] = this['store']['literal'](
+      },
-			    value, "", this['store']['sym'](
+
-				this['parent']['datatype']))
+      /** Add a bnode to this frame */
-		    }
+      'addBNode': function (id) {
-		    else {
+        if(id != null) {
-			this['node'] = this['store']['literal'](
+          if(this['parser']['bnodes'][id] != null) {
-			    value, this['lang'])
+            this['node'] = this['parser']['bnodes'][id]
-		    }
+          } else {
-		    this['nodeType'] = this['NODE']
+            this['node'] = this['parser']['bnodes'][id] = this['store']['bnode']()
-		    if (this['isTripleToLoad']()) {
+          }
-			this['loadTriple']()
+        } else {
-		    }
+          this['node'] = this['store']['bnode']()
-		}
+        }
-	       }
+
+        this['nodeType'] = this['NODE']
+        if(this['isTripleToLoad']()) {
+          this['loadTriple']()
+        }
+      },
+
+      /** Add an arc or property to this frame */
+      'addArc': function (uri) {
+        if(uri == RDFParser['ns']['RDF'] + "li") {
+          uri = RDFParser['ns']['RDF'] + "_" + this['parent']['listIndex']++
+        }
+        this['addSymbol'](this['ARC'], uri)
+      },
+
+      /** Add a literal to this frame */
+      'addLiteral': function (value) {
+        if(this['parent']['datatype']) {
+          this['node'] = this['store']['literal'](
+          value, "", this['store']['sym'](
+          this['parent']['datatype']))
+        } else {
+          this['node'] = this['store']['literal'](
+          value, this['lang'])
+        }
+        this['nodeType'] = this['NODE']
+        if(this['isTripleToLoad']()) {
+          this['loadTriple']()
+        }
+      }
+    }
+  }
+
+  //from the OpenLayers source .. needed to get around IE problems.
+  this['getAttributeNodeNS'] = function (node, uri, name) {
+    var attributeNode = null;
+    if(node.getAttributeNodeNS) {
+      attributeNode = node.getAttributeNodeNS(uri, name);
+    } else {
+      var attributes = node.attributes;
+      var potentialNode, fullName;
+      for(var i = 0; i < attributes.length; ++i) {
+        potentialNode = attributes[i];
+        if(potentialNode.namespaceURI == uri) {
+          fullName = (potentialNode.prefix) ? (potentialNode.prefix + ":" + name) : name;
+          if(fullName == potentialNode.nodeName) {
+            attributeNode = potentialNode;
+            break;
+          }
+        }
+      }
+    }
+    return attributeNode;
+  }
+
+  /** Our triple store reference @private */
+  this['store'] = store
+  /** Our identified blank nodes @private */
+  this['bnodes'] = {}
+  /** A context for context-aware stores @private */
+  this['why'] = null
+  /** Reification flag */
+  this['reify'] = false
+
+  /**
+   * Build our initial scope frame and parse the DOM into triples
+   * @param {DOMTree} document The DOM to parse
+   * @param {String} base The base URL to use 
+   * @param {Object} why The context to which this resource belongs
+   */
+  this['parse'] = function (document, base, why) {
+    // alert('parse base:'+base);
+    var children = document['childNodes']
+
+    // clean up for the next run
+    this['cleanParser']()
+
+    // figure out the root element
+    //var root = document.documentElement; //this is faster, I think, cross-browser issue? well, DOM 2
+    if(document['nodeType'] == RDFParser['nodeType']['DOCUMENT']) {
+      for(var c = 0; c < children['length']; c++) {
+        if(children[c]['nodeType'] == RDFParser['nodeType']['ELEMENT']) {
+          var root = children[c]
+          break
+        }
+      }
+    } else if(document['nodeType'] == RDFParser['nodeType']['ELEMENT']) {
+      var root = document
+    } else {
+      throw new Error("RDFParser: can't find root in " + base + ". Halting. ")
+      return false
     }
 
-    /** Our triple store reference @private */
+    this['why'] = why
-    this['store'] = store
-    /** Our identified blank nodes @private */
-    this['bnodes'] = {}
-    /** A context for context-aware stores @private */
-    this['why'] = null
-    /** Reification flag */
-    this['reify'] = false
 
-    /**
-     * Build our initial scope frame and parse the DOM into triples
-     * @param {DOMTree} document The DOM to parse
-     * @param {String} base The base URL to use 
-     * @param {Object} why The context to which this resource belongs
-     */
-    this['parse'] = function (document, base, why) {
-        // alert('parse base:'+base);
-	var children = document['childNodes']
 
-	// clean up for the next run
+    // our topmost frame
-	this['cleanParser']()
+    var f = this['frameFactory'](this)
+    this['base'] = base
+    f['base'] = base
+    f['lang'] = ''
 
-	// figure out the root element
+    this['parseDOM'](this['buildFrame'](f, root))
-	var root = document.documentElement; //this is faster, I think, cross-browser issue? well, DOM 2
+    return true
-	/*
+  }
-	if (document['nodeType'] == RDFParser['nodeType']['DOCUMENT']) {
+  this['parseDOM'] = function (frame) {
-	    for (var c=0; c<children['length']; c++) {
+    // a DOM utility function used in parsing
-		if (children[c]['nodeType']
+    var elementURI = function (el) {
-		    == RDFParser['nodeType']['ELEMENT']) {
+        var result = "";
-		    var root = children[c]
+        if(el['namespaceURI'] == null) {
-		    break
+          throw new Error("RDF/XML syntax error: No namespace for "
-		}
+            + el['localName'] + " in " + this.base)
-	    }	    
+        }
-	}
+        if(el['namespaceURI']) {
-	else if (document['nodeType'] == RDFParser['nodeType']['ELEMENT']) {
+          result = result + el['namespaceURI'];
-	    var root = document
+        }
-	}
+        if(el['localName']) {
-	else {
+          result = result + el['localName'];
-	    throw new Error("RDFParser: can't find root in " + base
+        } else if(el['nodeName']) {
-			    + ". Halting. ")
+          if(el['nodeName'].indexOf(":") >= 0)
-	    return false
+            result = result + el['nodeName'].split(":")[1];
-	}
+          else
-	*/
+            result = result + el['nodeName'];
-	
+        }
-	this['why'] = why
+        return result;
-        
+      }
+    var dig = true // if we'll dig down in the tree on the next iter
+    while(frame['parent']) {
+      var dom = frame['element']
+      var attrs = dom['attributes']
 
-	// our topmost frame
+      if(dom['nodeType'] == RDFParser['nodeType']['TEXT']
-
+        || dom['nodeType'] == RDFParser['nodeType']['CDATA_SECTION']) {
-	var f = this['frameFactory'](this)
+        //we have a literal
-        this['base'] = base
+        frame['addLiteral'](dom['nodeValue'])
-	f['base'] = base
+      } else if(elementURI(dom) != RDFParser['ns']['RDF'] + "RDF") {
-	f['lang'] = ''
+        // not root
-	
+        if(frame['parent'] && frame['parent']['collection']) {
-	this['parseDOM'](this['buildFrame'](f,root))
+          // we're a collection element
-	return true
+          frame['addCollectionArc']()
-    }
+          frame = this['buildFrame'](frame, frame['element'])
-    this['parseDOM'] = function (frame) {
+          frame['parent']['element'] = null
-	// a DOM utility function used in parsing
+        }
-	var elementURI = function (el) {
+        if(!frame['parent'] || !frame['parent']['nodeType']
-            if (el['namespaceURI'] == null) {
+          || frame['parent']['nodeType'] == frame['ARC']) {
-                throw new Error("RDF/XML syntax error: No namespace for "
+          // we need a node
-                            +el['localName']+" in "+this.base)
+          var about = this['getAttributeNodeNS'](dom, RDFParser['ns']['RDF'], "about")
+          var rdfid = this['getAttributeNodeNS'](dom, RDFParser['ns']['RDF'], "ID")
+          if(about && rdfid) {
+            throw new Error("RDFParser: " + dom['nodeName']
+              + " has both rdf:id and rdf:about." + " Halting. Only one of these"
+              + " properties may be specified on a" + " node.");
+          }
+          if(about == null && rdfid) {
+            frame['addNode']("#" + rdfid['nodeValue'])
+            dom['removeAttributeNode'](rdfid)
+          } else if(about == null && rdfid == null) {
+            var bnid = this['getAttributeNodeNS'](dom, RDFParser['ns']['RDF'], "nodeID")
+            if(bnid) {
+              frame['addBNode'](bnid['nodeValue'])
+              dom['removeAttributeNode'](bnid)
+            } else {
+              frame['addBNode']()
             }
-	    return el['namespaceURI'] + el['localName']
+          } else {
-	}
+            frame['addNode'](about['nodeValue'])
-	var dig = true // if we'll dig down in the tree on the next iter
+            dom['removeAttributeNode'](about)
+          }
 
-	while (frame['parent']) {
+          // Typed nodes
-	    var dom = frame['element']
+          var rdftype = this['getAttributeNodeNS'](dom, RDFParser['ns']['RDF'], "type")
-	    var attrs = dom['attributes']
+          if(RDFParser['ns']['RDF'] + "Description" != elementURI(dom)) {
+            rdftype = {
+              'nodeValue': elementURI(dom)
+            }
+          }
+          if(rdftype != null) {
+            this['store']['add'](frame['node'],
+              this['store']['sym'](RDFParser['ns']['RDF'] + "type"),
+              this['store']['sym'](
+                $rdf.Util.uri.join(
+                  rdftype['nodeValue'],
+                  frame['base'])),
+              this['why'])
+            if(rdftype['nodeName']) {
+              dom['removeAttributeNode'](rdftype)
+            }
+          }
 
-	    if (dom['nodeType']
+          // Property Attributes
-		== RDFParser['nodeType']['TEXT']
+          for(var x = attrs['length'] - 1; x >= 0; x--) {
-		|| dom['nodeType']
+            this['store']['add'](frame['node'],
-		== RDFParser['nodeType']['CDATA_SECTION']) {//we have a literal
+              this['store']['sym'](elementURI(attrs[x])),
-		frame['addLiteral'](dom['nodeValue'])
+              this['store']['literal'](
-	    }
+                attrs[x]['nodeValue'],
-	    else if (elementURI(dom)
+                frame['lang']),
-		     != RDFParser['ns']['RDF']+"RDF") { // not root
+              this['why'])
-		if (frame['parent'] && frame['parent']['collection']) {
+          }
-		    // we're a collection element
+        } else {
-		    frame['addCollectionArc']()
+          // we should add an arc (or implicit bnode+arc)
-		    frame = this['buildFrame'](frame,frame['element'])
+          frame['addArc'](elementURI(dom))
-		    frame['parent']['element'] = null
-		}
-                if (!frame['parent'] || !frame['parent']['nodeType']
-		    || frame['parent']['nodeType'] == frame['ARC']) {
-		    // we need a node
-		    var about =dom['getAttributeNodeNS'](
-			RDFParser['ns']['RDF'],"about")
-		    var rdfid =dom['getAttributeNodeNS'](
-			RDFParser['ns']['RDF'],"ID")
-		    if (about && rdfid) {
-			throw new Error("RDFParser: " + dom['nodeName']
-					+ " has both rdf:id and rdf:about."
-					+ " Halting. Only one of these"
-					+ " properties may be specified on a"
-					+ " node.");
-		    }
-		    if (about == null && rdfid) {
-			frame['addNode']("#"+rdfid['nodeValue'])
-			dom['removeAttributeNode'](rdfid)
-		    }
-		    else if (about == null && rdfid == null) {
-			var bnid = dom['getAttributeNodeNS'](
-			    RDFParser['ns']['RDF'],"nodeID")
-			if (bnid) {
-			    frame['addBNode'](bnid['nodeValue'])
-			    dom['removeAttributeNode'](bnid)
-			} else { frame['addBNode']() }
-		    }
-		    else {
-			frame['addNode'](about['nodeValue'])
-			dom['removeAttributeNode'](about)
-		    }
-		
-		    // Typed nodes
-		    var rdftype = dom['getAttributeNodeNS'](
-			RDFParser['ns']['RDF'],"type")
-		    if (RDFParser['ns']['RDF']+"Description"
-			!= elementURI(dom)) {
-			rdftype = {'nodeValue': elementURI(dom)}
-		    }
-		    if (rdftype != null) {
-			this['store']['add'](frame['node'],
-					     this['store']['sym'](
-						 RDFParser['ns']['RDF']+"type"),
-					     this['store']['sym'](
-						 Util.uri.join(
-						     rdftype['nodeValue'],
-						     frame['base'])),
-					     this['why'])
-			if (rdftype['nodeName']){
-			    dom['removeAttributeNode'](rdftype)
-			}
-		    }
-		    
-		    // Property Attributes
-		    for (var x = attrs['length']-1; x >= 0; x--) {
-			this['store']['add'](frame['node'],
-					     this['store']['sym'](
-						 elementURI(attrs[x])),
-					     this['store']['literal'](
-						 attrs[x]['nodeValue'],
-						 frame['lang']),
-					     this['why'])
-		    }
-		}
-		else { // we should add an arc (or implicit bnode+arc)
-		    frame['addArc'](elementURI(dom))
 
-		    // save the arc's rdf:ID if it has one
+          // save the arc's rdf:ID if it has one
-		    if (this['reify']) {
+          if(this['reify']) {
-			var rdfid = dom['getAttributeNodeNS'](
+            var rdfid = this['getAttributeNodeNS'](dom, RDFParser['ns']['RDF'], "ID")
-			    RDFParser['ns']['RDF'],"ID")
+            if(rdfid) {
-			if (rdfid) {
+              frame['rdfid'] = rdfid['nodeValue']
-			    frame['rdfid'] = rdfid['nodeValue']
+              dom['removeAttributeNode'](rdfid)
-			    dom['removeAttributeNode'](rdfid)
+            }
-			}
+          }
-		    }
 
-		    var parsetype = dom['getAttributeNodeNS'](
+          var parsetype = this['getAttributeNodeNS'](dom, RDFParser['ns']['RDF'], "parseType")
-			RDFParser['ns']['RDF'],"parseType")
+          var datatype = this['getAttributeNodeNS'](dom, RDFParser['ns']['RDF'], "datatype")
-		    var datatype = dom['getAttributeNodeNS'](
+          if(datatype) {
-			RDFParser['ns']['RDF'],"datatype")
+            frame['datatype'] = datatype['nodeValue']
-		    if (datatype) {
+            dom['removeAttributeNode'](datatype)
-			frame['datatype'] = datatype['nodeValue']
+          }
-			dom['removeAttributeNode'](datatype)
-		    }
 
-		    if (parsetype) {
+          if(parsetype) {
-			var nv = parsetype['nodeValue']
+            var nv = parsetype['nodeValue']
-			if (nv == "Literal") {
+            if(nv == "Literal") {
-			    frame['datatype']
+              frame['datatype'] = RDFParser['ns']['RDF'] + "XMLLiteral"
-				= RDFParser['ns']['RDF']+"XMLLiteral"
+              // (this.buildFrame(frame)).addLiteral(dom)
-			    // (this.buildFrame(frame)).addLiteral(dom)
+              // should work but doesn't
-			    // should work but doesn't
+              frame = this['buildFrame'](frame)
-			    frame = this['buildFrame'](frame)
+              frame['addLiteral'](dom)
-			    frame['addLiteral'](dom)
+              dig = false
-			    dig = false
+            } else if(nv == "Resource") {
-			}
+              frame = this['buildFrame'](frame, frame['element'])
-			else if (nv == "Resource") {
+              frame['parent']['element'] = null
-			    frame = this['buildFrame'](frame,frame['element'])
+              frame['addBNode']()
-			    frame['parent']['element'] = null
+            } else if(nv == "Collection") {
-			    frame['addBNode']()
+              frame = this['buildFrame'](frame, frame['element'])
-			}
+              frame['parent']['element'] = null
-			else if (nv == "Collection") {
+              frame['addCollection']()
-			    frame = this['buildFrame'](frame,frame['element'])
+            }
-			    frame['parent']['element'] = null
+            dom['removeAttributeNode'](parsetype)
-			    frame['addCollection']()
+          }
-			}
-			dom['removeAttributeNode'](parsetype)
-		    }
 
-		    if (attrs['length'] != 0) {
+          if(attrs['length'] != 0) {
-			var resource = dom['getAttributeNodeNS'](
+            var resource = this['getAttributeNodeNS'](dom, RDFParser['ns']['RDF'], "resource")
-			    RDFParser['ns']['RDF'],"resource")
+            var bnid = this['getAttributeNodeNS'](dom, RDFParser['ns']['RDF'], "nodeID")
-			var bnid = dom['getAttributeNodeNS'](
-			    RDFParser['ns']['RDF'],"nodeID")
 
-			frame = this['buildFrame'](frame)
+            frame = this['buildFrame'](frame)
-			if (resource) {
+            if(resource) {
-			    frame['addNode'](resource['nodeValue'])
+              frame['addNode'](resource['nodeValue'])
-			    dom['removeAttributeNode'](resource)
+              dom['removeAttributeNode'](resource)
-			} else {
+            } else {
-			    if (bnid) {
+              if(bnid) {
-				frame['addBNode'](bnid['nodeValue'])
+                frame['addBNode'](bnid['nodeValue'])
-				dom['removeAttributeNode'](bnid)
+                dom['removeAttributeNode'](bnid)
-			    } else { frame['addBNode']() }
+              } else {
-			}
+                frame['addBNode']()
+              }
+            }
 
-			for (var x = attrs['length']-1; x >= 0; x--) {
+            for(var x = attrs['length'] - 1; x >= 0; x--) {
-			    var f = this['buildFrame'](frame)
+              var f = this['buildFrame'](frame)
-			    f['addArc'](elementURI(attrs[x]))
+              f['addArc'](elementURI(attrs[x]))
-			    if (elementURI(attrs[x])
+              if(elementURI(attrs[x]) == RDFParser['ns']['RDF'] + "type") {
-				==RDFParser['ns']['RDF']+"type"){
+                (this['buildFrame'](f))['addNode'](
-				(this['buildFrame'](f))['addNode'](
+                attrs[x]['nodeValue'])
-				    attrs[x]['nodeValue'])
+              } else {
-			    } else {
+                (this['buildFrame'](f))['addLiteral'](
-				(this['buildFrame'](f))['addLiteral'](
+                attrs[x]['nodeValue'])
-				    attrs[x]['nodeValue'])
+              }
-			    }
+            }
-			}
+          } else if(dom['childNodes']['length'] == 0) {
-		    }
+            (this['buildFrame'](frame))['addLiteral']("")
-		    else if (dom['childNodes']['length'] == 0) {
+          }
-			(this['buildFrame'](frame))['addLiteral']("")
+        }
-		    }
+      } // rdf:RDF
-		}
+      // dig dug
-	    } // rdf:RDF
+      dom = frame['element']
+      while(frame['parent']) {
+        var pframe = frame
+        while(dom == null) {
+          frame = frame['parent']
+          dom = frame['element']
+        }
+        var candidate = dom['childNodes'][frame['lastChild']]
+        if(candidate == null || !dig) {
+          frame['terminateFrame']()
+          if(!(frame = frame['parent'])) {
+            break
+          } // done
+          dom = frame['element']
+          dig = true
+        } else if((candidate['nodeType'] != RDFParser['nodeType']['ELEMENT']
+            && candidate['nodeType'] != RDFParser['nodeType']['TEXT']
+            && candidate['nodeType'] != RDFParser['nodeType']['CDATA_SECTION'])
+          || ((candidate['nodeType'] == RDFParser['nodeType']['TEXT']
+              || candidate['nodeType'] == RDFParser['nodeType']['CDATA_SECTION'])
+            && dom['childNodes']['length'] != 1)) {
+          frame['lastChild']++
+        } else {
+          // not a leaf
+          frame['lastChild']++;
+          frame = this['buildFrame'](pframe, dom['childNodes'][frame['lastChild'] - 1])
+          break
+        }
+      }
+    } // while
+  }
 
-	    // dig dug
+  /**
-	    dom = frame['element']
+   * Cleans out state from a previous parse run
-	    while (frame['parent']) {
+   * @private
-		var pframe = frame
+   */
-		while (dom == null) {
+  this['cleanParser'] = function () {
-		    frame = frame['parent']
+    this['bnodes'] = {}
-		    dom = frame['element']
+    this['why'] = null
-		}
+  }
-		var candidate = dom['childNodes'][frame['lastChild']]
+
-		if (candidate == null || !dig) {
+  /**
-		    frame['terminateFrame']()
+   * Builds scope frame 
-		    if (!(frame = frame['parent'])) { break } // done
+   * @private
-		    dom = frame['element']
+   */
-		    dig = true
+  this['buildFrame'] = function (parent, element) {
-		}
+    var frame = this['frameFactory'](this, parent, element)
-		else if ((candidate['nodeType']
+    if(parent) {
-			  != RDFParser['nodeType']['ELEMENT']
+      frame['base'] = parent['base']
-			  && candidate['nodeType']
+      frame['lang'] = parent['lang']
-			  != RDFParser['nodeType']['TEXT']
+    }
-			  && candidate['nodeType']
+    if(element == null
-			  != RDFParser['nodeType']['CDATA_SECTION'])
+      || element['nodeType'] == RDFParser['nodeType']['TEXT']
-			 || ((candidate['nodeType']
+      || element['nodeType'] == RDFParser['nodeType']['CDATA_SECTION']) {
-			      == RDFParser['nodeType']['TEXT']
+      return frame
-			      || candidate['nodeType']
-			      == RDFParser['nodeType']['CDATA_SECTION'])
-			     && dom['childNodes']['length'] != 1)) {
-		    frame['lastChild']++
-		}
-		else { // not a leaf
-		    frame['lastChild']++
-		    frame = this['buildFrame'](pframe,
-					       dom['childNodes'][frame['lastChild']-1])
-		    break
-		}
-	    }
-	} // while
     }
 
-    /**
+    var attrs = element['attributes']
-     * Cleans out state from a previous parse run
+
-     * @private
+    var base = element['getAttributeNode']("xml:base")
-     */
+    if(base != null) {
-    this['cleanParser'] = function () {
+      frame['base'] = base['nodeValue']
-	this['bnodes'] = {}
+      element['removeAttribute']("xml:base")
-	this['why'] = null
+    }
+    var lang = element['getAttributeNode']("xml:lang")
+    if(lang != null) {
+      frame['lang'] = lang['nodeValue']
+      element['removeAttribute']("xml:lang")
     }
 
-    /**
+    // remove all extraneous xml and xmlns attributes
-     * Builds scope frame 
+    for(var x = attrs['length'] - 1; x >= 0; x--) {
-     * @private
+      if(attrs[x]['nodeName']['substr'](0, 3) == "xml") {
-     */
+        if(attrs[x].name.slice(0, 6) == 'xmlns:') {
-    this['buildFrame'] = function (parent, element) {
+          var uri = attrs[x].nodeValue;
-	var frame = this['frameFactory'](this,parent,element)
+          // alert('base for namespac attr:'+this.base);
-	if (parent) {
+          if(this.base) uri = $rdf.Util.uri.join(uri, this.base);
-	    frame['base'] = parent['base']
+          this.store.setPrefixForURI(attrs[x].name.slice(6), uri);
-	    frame['lang'] = parent['lang']
+        }
-	}
+        //		alert('rdfparser: xml atribute: '+attrs[x].name) //@@
-	if (element == null
+        element['removeAttributeNode'](attrs[x])
-	    || element['nodeType'] == RDFParser['nodeType']['TEXT']
+      }
-	    || element['nodeType'] == RDFParser['nodeType']['CDATA_SECTION']) {
-	    return frame
-	}
-
-	var attrs = element['attributes']
-
-	var base = element['getAttributeNode']("xml:base")
-	if (base != null) {
-	    frame['base'] = base['nodeValue']
-	    element['removeAttribute']("xml:base")
-	}
-	var lang = element['getAttributeNode']("xml:lang")
-	if (lang != null) {
-	    frame['lang'] = lang['nodeValue']
-	    element['removeAttribute']("xml:lang")
-	}
-
-	// remove all extraneous xml and xmlns attributes
-	for (var x = attrs['length']-1; x >= 0; x--) {
-	    if (attrs[x]['nodeName']['substr'](0,3) == "xml") {
-                if (attrs[x].name.slice(0,6)=='xmlns:') {
-                    var uri = attrs[x].nodeValue;
-                    // alert('base for namespac attr:'+this.base);
-                    if (this.base) uri = Util.uri.join(uri, this.base);
-                    this.store.setPrefixForURI(attrs[x].name.slice(6),
-                                                uri);
-                }
-//		alert('rdfparser: xml atribute: '+attrs[x].name) //@@
-		element['removeAttributeNode'](attrs[x])
-	    }
-	}
-	return frame
     }
+    return frame
+  }
 }

chrome/content/zotero/xpcom/rdf/term.js

@@ -7,139 +7,161 @@
 //
 // W3C open source licence 2005.
 //
-
-RDFTracking = 0  // Are we requiring reasons for statements?
-
-//takes in an object and makes it an object if it's a literal
-function makeTerm(val) {
-    //  tabulator.log.debug("Making term from " + val)
-    if (typeof val == 'object') return val;
-    if (typeof val == 'string') return new RDFLiteral(val);
-    if (typeof val == 'number') return new RDFLiteral(val); // @@ differet types
-    if (typeof val == 'boolean') return new RDFLiteral(val?"1":"0", undefined, 
-                                                RDFSymbol.prototype.XSDboolean);
-    if (typeof val == 'undefined') return undefined;
-    alert("Can't make term from " + val + " of type " + typeof val);
-}
-
-
 //	Symbol
+$rdf.Empty = function () {
+  return this;
+};
 
-function RDFEmpty() {
+$rdf.Empty.prototype.termType = 'empty';
-	return this;
+$rdf.Empty.prototype.toString = function () {
-}
+  return "()"
-RDFEmpty.prototype.termType = 'empty'
+};
-RDFEmpty.prototype.toString = function () { return "()" }
+$rdf.Empty.prototype.toNT = $rdf.Empty.prototype.toString;
-RDFEmpty.prototype.toNT = function () { return "@@" }
 
-function RDFSymbol_toNT(x) {
+$rdf.Symbol = function (uri) {
-    return ("<" + x.uri + ">")
+  this.uri = uri;
+  this.value = uri; // -- why? -tim
+  return this;
 }
 
-function toNT() {
+$rdf.Symbol.prototype.termType = 'symbol';
-    return RDFSymbol_toNT(this)
+$rdf.Symbol.prototype.toString = function () {
-}
+  return("<" + this.uri + ">");
-
+};
-function RDFSymbol(uri) {
+$rdf.Symbol.prototype.toNT = $rdf.Symbol.prototype.toString;
-    this.uri = uri
-    return this
-}
-	
-RDFSymbol.prototype.termType = 'symbol'
-RDFSymbol.prototype.toString = toNT
-RDFSymbol.prototype.toNT = toNT
-
-//  Some precalculaued symbols
-
-RDFSymbol.prototype.XSDboolean = new RDFSymbol('http://www.w3.org/2001/XMLSchema#boolean');
-RDFSymbol.prototype.integer = new RDFSymbol('http://www.w3.org/2001/XMLSchema#integer');
-
 
+//  Some precalculated symbols
+$rdf.Symbol.prototype.XSDboolean = new $rdf.Symbol('http://www.w3.org/2001/XMLSchema#boolean');
+$rdf.Symbol.prototype.XSDdecimal = new $rdf.Symbol('http://www.w3.org/2001/XMLSchema#decimal');
+$rdf.Symbol.prototype.XSDfloat = new $rdf.Symbol('http://www.w3.org/2001/XMLSchema#float');
+$rdf.Symbol.prototype.XSDinteger = new $rdf.Symbol('http://www.w3.org/2001/XMLSchema#integer');
+$rdf.Symbol.prototype.XSDdateTime = new $rdf.Symbol('http://www.w3.org/2001/XMLSchema#dateTime');
+$rdf.Symbol.prototype.integer = new $rdf.Symbol('http://www.w3.org/2001/XMLSchema#integer'); // Used?
 //	Blank Node
+if(typeof $rdf.NextId != 'undefined') {
+  $rdf.log.error('Attempt to re-zero existing blank node id counter at ' + $rdf.NextId);
+} else {
+  $rdf.NextId = 0; // Global genid
+}
+$rdf.NTAnonymousNodePrefix = "_:n";
 
-var RDFNextId = 0;  // Gobal genid
+$rdf.BlankNode = function (id) {
-RDFGenidPrefix = "genid:"
+  /*if (id)
-NTAnonymousNodePrefix = "_:n"
-
-function RDFBlankNode(id) {
-    /*if (id)
     	this.id = id;
     else*/
-    this.id = RDFNextId++
+  this.id = $rdf.NextId++;
-    return this
+  this.value = id ? id : this.id.toString();
-}
+  return this
+};
 
-RDFBlankNode.prototype.termType = 'bnode'
+$rdf.BlankNode.prototype.termType = 'bnode';
-
+$rdf.BlankNode.prototype.toNT = function () {
-RDFBlankNode.prototype.toNT = function() {
+  return $rdf.NTAnonymousNodePrefix + this.id
-    return NTAnonymousNodePrefix + this.id
+};
-}
+$rdf.BlankNode.prototype.toString = $rdf.BlankNode.prototype.toNT;
-RDFBlankNode.prototype.toString = RDFBlankNode.prototype.toNT  
 
 //	Literal
-
+$rdf.Literal = function (value, lang, datatype) {
-function RDFLiteral(value, lang, datatype) {
+  this.value = value
-    this.value = value
+  if(lang == "" || lang == null) this.lang = undefined;
-    this.lang=lang;	  // string
+  else this.lang = lang; // string
-    this.datatype=datatype;  // term
+  if(datatype == null) this.datatype = undefined;
-    this.toString = RDFLiteralToString
+  else this.datatype = datatype; // term
-    this.toNT = RDFLiteral_toNT
+  return this;
-    return this
 }
 
-RDFLiteral.prototype.termType = 'literal'
+$rdf.Literal.prototype.termType = 'literal'
+$rdf.Literal.prototype.toString = function () {
+  return '' + this.value;
+};
+$rdf.Literal.prototype.toNT = function () {
+  var str = this.value
+  if(typeof str != 'string') {
+    if(typeof str == 'number') return '' + str;
+    throw Error("Value of RDF literal is not string: " + str)
+  }
+  str = str.replace(/\\/g, '\\\\'); // escape backslashes
+  str = str.replace(/\"/g, '\\"'); // escape quotes
+  str = str.replace(/\n/g, '\\n'); // escape newlines
+  str = '"' + str + '"' //';
+  if(this.datatype) {
+    str = str + '^^' + this.datatype.toNT()
+  }
+  if(this.lang) {
+    str = str + "@" + this.lang;
+  }
+  return str;
+};
 
-function RDFLiteral_toNT() {
+$rdf.Collection = function () {
-    var str = this.value
+  this.id = $rdf.NextId++; // Why need an id? For hashstring.
-    if (typeof str != 'string') {
+  this.elements = [];
-        if (typeof str == 'number') return ''+str;
+  this.closed = false;
-	throw Error("Value of RDF literal is not string: "+str)
+};
-    }
-    str = str.replace(/\\/g, '\\\\');  // escape
-    str = str.replace(/\"/g, '\\"');
-    str = '"' + str + '"'  //'
 
-    if (this.datatype){
+$rdf.Collection.prototype.termType = 'collection';
-	str = str + '^^' + this.datatype//.toNT()
+
-    }
+$rdf.Collection.prototype.toNT = function () {
-    if (this.lang) {
+  return $rdf.NTAnonymousNodePrefix + this.id
-	str = str + "@" + this.lang
+};
-    }
+
-    return str
+$rdf.Collection.prototype.toString = function () {
+  var str = '(';
+  for(var i = 0; i < this.elements.length; i++)
+  str += this.elements[i] + ' ';
+  return str + ')';
+};
+
+$rdf.Collection.prototype.append = function (el) {
+  this.elements.push(el)
+}
+$rdf.Collection.prototype.unshift = function (el) {
+  this.elements.unshift(el);
+}
+$rdf.Collection.prototype.shift = function () {
+  return this.elements.shift();
 }
 
-function RDFLiteralToString() {
+$rdf.Collection.prototype.close = function () {
-    return ''+this.value
+  this.closed = true
-}
-    
-RDFLiteral.prototype.toString = RDFLiteralToString   
-RDFLiteral.prototype.toNT = RDFLiteral_toNT
-
-function RDFCollection() {
-    this.id = RDFNextId++
-    this.elements = []
-    this.closed = false
 }
 
-RDFCollection.prototype.termType = 'collection'
 
-RDFCollection.prototype.toNT = function() {
+//      Convert Javascript representation to RDF term object
-    return NTAnonymousNodePrefix + this.id
+//
-}
+$rdf.term = function (val) {
-RDFCollection.prototype.toString = RDFCollection.prototype.toNT 
+  if(typeof val == 'object')
+    if(val instanceof Date) {
+      var d2 = function (x) {
+          return('' + (100 + x)).slice(1, 3)
+        }; // format as just two digits
+      return new $rdf.Literal('' + val.getUTCFullYear() + '-' + d2(val.getUTCMonth() + 1)
+          + '-' + d2(val.getUTCDate()) + 'T' + d2(val.getUTCHours()) + ':'
+          + d2(val.getUTCMinutes()) + ':' + d2(val.getUTCSeconds()) + 'Z',
+        undefined,
+        $rdf.Symbol.prototype.XSDdateTime);
 
-RDFCollection.prototype.append = function (el) {
+    } else if(val instanceof Array) {
-    this.elements.push(el)
+      var x = new $rdf.Collection();
-}
+      for(var i = 0; i < val.length; i++)
-RDFCollection.prototype.unshift=function(el){
+        x.append($rdf.term(val[i]));
-    this.elements.unshift(el);
+      return x;
-}
+    } else
-RDFCollection.prototype.shift=function(){
+      return val;
-    return this.elements.shift();
+  if(typeof val == 'string')
-}
+    return new $rdf.Literal(val);
-        
+  if(typeof val == 'number') {
-RDFCollection.prototype.close = function () {
+    var dt;
-    this.closed = true
+    if(('' + val).indexOf('e') >= 0) dt = $rdf.Symbol.prototype.XSDfloat;
+    else if(('' + val).indexOf('.') >= 0) dt = $rdf.Symbol.prototype.XSDdecimal;
+    else dt = $rdf.Symbol.prototype.XSDinteger;
+    return new $rdf.Literal(val, undefined, dt);
+  }
+  if(typeof val == 'boolean')
+    return new $rdf.Literal(val ? "1" : "0", undefined, $rdf.Symbol.prototype.XSDboolean);
+  if(typeof val == 'undefined')
+    return undefined;
+  throw("Can't make term from " + val + " of type " + typeof val);
 }
 
 //	Statement
@@ -148,144 +170,133 @@ RDFCollection.prototype.close = function () {
 //
 //   The reason can point to provenece or inference
 //
-function RDFStatement_toNT() {
+$rdf.Statement = function (subject, predicate, object, why) {
-    return (this.subject.toNT() + " "
+  this.subject = $rdf.term(subject)
-	    + this.predicate.toNT() + " "
+  this.predicate = $rdf.term(predicate)
-	    +  this.object.toNT() +" .")
+  this.object = $rdf.term(object)
+  if(typeof why != 'undefined') {
+    this.why = why;
+  }
+  return this;
 }
 
-function RDFStatement(subject, predicate, object, why) {
+$rdf.st = function (subject, predicate, object, why) {
-    this.subject = makeTerm(subject)
+  return new $rdf.Statement(subject, predicate, object, why);
-    this.predicate = makeTerm(predicate)
+};
-    this.object = makeTerm(object)
-    if (typeof why !='undefined') {
-	this.why = why
-    } else if (RDFTracking) {
-	tabulator.log.debug("WARNING: No reason on "+subject+" "+predicate+" "+object)
-    }
-    return this
-}
 
-RDFStatement.prototype.toNT = RDFStatement_toNT
+$rdf.Statement.prototype.toNT = function () {
-RDFStatement.prototype.toString = RDFStatement_toNT
+  return (this.subject.toNT() + " " + this.predicate.toNT() + " " + this.object.toNT() + " .");
-	
+};
+
+$rdf.Statement.prototype.toString = $rdf.Statement.prototype.toNT;
 
 //	Formula
 //
 //	Set of statements.
+$rdf.Formula = function () {
+  this.statements = []
+  this.constraints = []
+  this.initBindings = []
+  this.optional = []
+  return this;
+};
 
-function RDFFormula() {
-    this.statements = []
-    this.constraints = []
-    this.initBindings = []
-    this.optional = []
-    this.superFormula = null;
-    return this
-}
 
-function RDFFormula_toNT() {
+$rdf.Formula.prototype.termType = 'formula';
-    // throw 'Who called me?';    
+$rdf.Formula.prototype.toNT = function () {
-    return "{" + this.statements.join('\n') + "}"
+  return "{" + this.statements.join('\n') + "}"
-}
+};
+$rdf.Formula.prototype.toString = $rdf.Formula.prototype.toNT;
 
-//RDFQueryFormula.prototype = new RDFFormula()
+$rdf.Formula.prototype.add = function (subj, pred, obj, why) {
-//RDFQueryFormula.termType = 'queryFormula'
+  this.statements.push(new $rdf.Statement(subj, pred, obj, why))
-RDFFormula.prototype.termType = 'formula'
-RDFFormula.prototype.toNT = RDFFormula_toNT
-RDFFormula.prototype.toString = RDFFormula_toNT   
-
-RDFFormula.prototype.add = function(subj, pred, obj, why) {
-    this.statements.push(new RDFStatement(subj, pred, obj, why))
 }
 
 // Convenience methods on a formula allow the creation of new RDF terms:
+$rdf.Formula.prototype.sym = function (uri, name) {
+  if(name != null) {
+    throw "This feature (kb.sym with 2 args) is removed. Do not assume prefix mappings."
+    if(!$rdf.ns[uri]) throw 'The prefix "' + uri + '" is not set in the API';
+    uri = $rdf.ns[uri] + name
+  }
+  return new $rdf.Symbol(uri)
+}
 
-RDFFormula.prototype.sym = function(uri,name) {
+$rdf.sym = function (uri) {
-    if (name != null) {
+  return new $rdf.Symbol(uri);
-        if (!tabulator.ns[uri]) throw 'The prefix "'+uri+'" is not set in the API';
+};
-	uri = tabulator.ns[uri] + name
+
+$rdf.Formula.prototype.literal = function (val, lang, dt) {
+  return new $rdf.Literal(val.toString(), lang, dt)
+}
+$rdf.lit = $rdf.Formula.prototype.literal;
+
+$rdf.Formula.prototype.bnode = function (id) {
+  return new $rdf.BlankNode(id)
+}
+
+$rdf.Formula.prototype.formula = function () {
+  return new $rdf.Formula()
+}
+
+$rdf.Formula.prototype.collection = function () { // obsolete
+  return new $rdf.Collection()
+}
+
+$rdf.Formula.prototype.list = function (values) {
+  var li = new $rdf.Collection();
+  if(values) {
+    for(var i = 0; i < values.length; i++) {
+      li.append(values[i]);
     }
-    return new RDFSymbol(uri)
+  }
+  return li;
 }
 
-RDFFormula.prototype.literal = function(val, lang, dt) {
-    return new RDFLiteral(val.toString(), lang, dt)
-}
-
-RDFFormula.prototype.bnode = function(id) {
-    return new RDFBlankNode(id)
-}
-
-RDFFormula.prototype.formula = function() {
-    return new RDFFormula()
-}
-
-RDFFormula.prototype.collection = function () { // obsolete
-    return new RDFCollection()
-}
-
-RDFFormula.prototype.list = function (values) {
-    li = new RDFCollection();
-    if (values) {
-        for(var i = 0; i<values.length; i++) {
-            li.append(values[i]);
-        }
-    }
-    return li;
-}
-
-RDFFormula.instances={};
-RDFFormula.prototype.registerFormula = function(accesskey){
-    var superFormula = this.superFormula || this;
-    RDFFormula.instances[accesskey] = this;
-    var formulaTerm = superFormula.bnode();
-    superFormula.add(formulaTerm, tabulator.ns.rdf('type'),superFormula.sym("http://www.w3.org/2000/10/swap/log#Formula"));
-    superFormula.add(formulaTerm, tabulator.ns.foaf('name'), superFormula.literal(accesskey));
-    superFormula.add(formulaTerm, tabulator.ns.link('accesskey'), superFormula.literal(accesskey));
-    //RDFFormula.instances.push("accesskey");
-}
-
-
 /*  Variable
-**
+ **
-** Variables are placeholders used in patterns to be matched.
+ ** Variables are placeholders used in patterns to be matched.
-** In cwm they are symbols which are the formula's list of quantified variables.
+ ** In cwm they are symbols which are the formula's list of quantified variables.
-** In sparl they are not visibily URIs.  Here we compromise, by having
+ ** In sparl they are not visibily URIs.  Here we compromise, by having
-** a common special base URI for variables.
+ ** a common special base URI for variables. Their names are uris,
-*/
+ ** but the ? nottaion has an implicit base uri of 'varid:'
+ */
 
-RDFVariableBase = "varid:"; // We deem variabe x to be the symbol varid:x 
+$rdf.Variable = function (rel) {
-
+  this.base = "varid:"; // We deem variabe x to be the symbol varid:x 
-function RDFVariable(rel) {
+  this.uri = $rdf.Util.uri.join(rel, this.base);
-    this.uri = URIjoin(rel, RDFVariableBase);
+  return this;
-    return this;
 }
 
-RDFVariable.prototype.termType = 'variable';
+$rdf.Variable.prototype.termType = 'variable';
-RDFVariable.prototype.toNT = function() {
+$rdf.Variable.prototype.toNT = function () {
-    if (this.uri.slice(0, RDFVariableBase.length) == RDFVariableBase) {
+  if(this.uri.slice(0, this.base.length) == this.base) {
-	return '?'+ this.uri.slice(RDFVariableBase.length);} // @@ poor man's refTo
+    return '?' + this.uri.slice(this.base.length);
-    return '?' + this.uri;
+  } // @@ poor man's refTo
+  return '?' + this.uri;
 };
 
-RDFVariable.prototype.toString = RDFVariable.prototype.toNT;
+$rdf.Variable.prototype.toString = $rdf.Variable.prototype.toNT;
-RDFVariable.prototype.classOrder = 7;
+$rdf.Variable.prototype.classOrder = 7;
 
-RDFFormula.prototype.variable = function(name) {
+$rdf.variable = $rdf.Formula.prototype.variable = function (name) {
-    return new RDFVariable(name);
+  return new $rdf.Variable(name);
 };
 
-RDFVariable.prototype.hashString = RDFVariable.prototype.toNT;
+$rdf.Variable.prototype.hashString = $rdf.Variable.prototype.toNT;
 
 
 // The namespace function generator 
-
+$rdf.Namespace = function (nsuri) {
-function RDFNamespace(nsuri) {
+  return function (ln) {
-    return function(ln) { return new RDFSymbol(nsuri+(ln===undefined?'':ln)) }
+    return new $rdf.Symbol(nsuri + (ln === undefined ? '' : ln))
+  }
 }
 
-RDFFormula.prototype.ns = function(nsuri) {
+$rdf.Formula.prototype.ns = function (nsuri) {
-    return function(ln) { return new RDFSymbol(nsuri+(ln===undefined?'':ln)) }
+  return function (ln) {
+    return new $rdf.Symbol(nsuri + (ln === undefined ? '' : ln))
+  }
 }
 
 
@@ -293,21 +304,43 @@ RDFFormula.prototype.ns = function(nsuri) {
 //
 // The bnode bit should not be used on program-external values; designed
 // for internal work such as storing a bnode id in an HTML attribute.
-// Not coded for literals.
+// This will only parse the strings generated by the vaious toNT() methods.
-
+$rdf.Formula.prototype.fromNT = function (str) {
-RDFFormula.prototype.fromNT = function(str) {
+  var len = str.length
-    var len = str.length
+  var ch = str.slice(0, 1)
-    var ch = str.slice(0,1)
+  if(ch == '<') return $rdf.sym(str.slice(1, len - 1))
-    if (ch == '<') return this.sym(str.slice(1,len-1))
+  if(ch == '"') {
-    if (ch == '_') {
+    var lang = undefined;
-	var x = new RDFBlankNode();
+    var dt = undefined;
-	x.id = parseInt(str.slice(3));
+    var k = str.lastIndexOf('"');
-	RDFNextId--
+    if(k < len - 1) {
-	return x
+      if(str[k + 1] == '@') lang = str.slice(k + 2, len);
+      else if(str.slice(k + 1, k + 3) == '^^') dt = $rdf.fromNT(str.slice(k + 3, len));
+      else throw "Can't convert string from NT: " + str
     }
-    throw "Can't convert from NT"+str;
+    var str = (str.slice(1, k));
-    
+    str = str.replace(/\\"/g, '"'); // unescape quotes '
-    //alert("Can't yet convert from NT: '"+str+"', "+str[0])
+    str = str.replace(/\\n/g, '\n'); // unescape newlines
-}
+    str = str.replace(/\\\\/g, '\\'); // unescape backslashes 
+    return $rdf.lit(str, lang, dt);
+  }
+  if(ch == '_') {
+    var x = new $rdf.BlankNode();
+    x.id = parseInt(str.slice(3));
+    $rdf.NextId--
+    return x
+  }
+  if(ch == '?') {
+    var x = new $rdf.Variable(str.slice(1));
+    return x;
+  }
+  throw "Can't convert from NT: " + str;
 
-// ends
+}
+$rdf.fromNT = $rdf.Formula.prototype.fromNT; // Not for inexpert user
+// Convenience - and more conventional name:
+$rdf.graph = function () {
+  return new $rdf.IndexedFormula();
+};
+
+// ends

chrome/content/zotero/xpcom/rdf/uri.js

@@ -11,133 +11,139 @@
 //
 //  See also http://www.w3.org/2000/10/swap/uripath.py
 //
+if(typeof $rdf.Util.uri == "undefined") {
+  $rdf.Util.uri = {};
+};
 
-if (typeof Util == "undefined") { Util = {}}
+$rdf.Util.uri.join = function (given, base) {
-if (typeof Util.uri == "undefined") { Util.uri = {}}
+  // if (typeof $rdf.log.debug != 'undefined') $rdf.log.debug("   URI given="+given+" base="+base)
-
+  var baseHash = base.indexOf('#')
-Util.uri.join = function (given, base) {
+  if(baseHash > 0) base = base.slice(0, baseHash)
-    // if (typeof tabulator.log.debug != 'undefined') tabulator.log.debug("   URI given="+given+" base="+base)
+  if(given.length == 0) return base // before chopping its filename off
-    var baseHash = base.indexOf('#')
+  if(given.indexOf('#') == 0) return base + given
-    if (baseHash > 0) base = base.slice(0, baseHash)
+  var colon = given.indexOf(':')
-    if (given.length==0) return base // before chopping its filename off
+  if(colon >= 0) return given // Absolute URI form overrides base URI
-    if (given.indexOf('#')==0) return base + given
+  var baseColon = base.indexOf(':')
-    var colon = given.indexOf(':')
+  if(base == "") return given;
-    if (colon >= 0) return given	// Absolute URI form overrides base URI
+  if(baseColon < 0) {
-    var baseColon = base.indexOf(':')
+    alert("Invalid base: " + base + ' in join with ' + given);
-    if (base == "") return given;
+    return given
-    if (baseColon < 0) {
+  }
-        alert("Invalid base: "+ base + ' in join with ' +given);
+  var baseScheme = base.slice(0, baseColon + 1) // eg http:
-        return given
+  if(given.indexOf("//") == 0) // Starts with //
+  return baseScheme + given;
+  if(base.indexOf('//', baseColon) == baseColon + 1) { // Any hostpart?
+    var baseSingle = base.indexOf("/", baseColon + 3)
+    if(baseSingle < 0) {
+      if(base.length - baseColon - 3 > 0) {
+        return base + "/" + given
+      } else {
+        return baseScheme + given
+      }
     }
-    var baseScheme = base.slice(0,baseColon+1)  // eg http:
+  } else {
-    if (given.indexOf("//") == 0)     // Starts with //
+    var baseSingle = base.indexOf("/", baseColon + 1)
-	return baseScheme + given;
+    if(baseSingle < 0) {
-    if (base.indexOf('//', baseColon)==baseColon+1) {  // Any hostpart?
+      if(base.length - baseColon - 1 > 0) {
-	    var baseSingle = base.indexOf("/", baseColon+3)
+        return base + "/" + given
-	if (baseSingle < 0) {
+      } else {
-	    if (base.length-baseColon-3 > 0) {
+        return baseScheme + given
-		return base + "/" + given
+      }
-	    } else {
-		return baseScheme + given
-	    }
-	}
-    } else {
-	var baseSingle = base.indexOf("/", baseColon+1)
-	if (baseSingle < 0) {
-	    if (base.length-baseColon-1 > 0) {
-		return base + "/" + given
-	    } else {
-		return baseScheme + given
-	    }
-	}
     }
+  }
 
-    if (given.indexOf('/') == 0)	// starts with / but not //
+  if(given.indexOf('/') == 0) // starts with / but not //
-	return base.slice(0, baseSingle) + given
+  return base.slice(0, baseSingle) + given
-    
+
-    var path = base.slice(baseSingle)
+  var path = base.slice(baseSingle)
-    var lastSlash = path.lastIndexOf("/")
+  var lastSlash = path.lastIndexOf("/")
-    if (lastSlash <0) return baseScheme + given
+  if(lastSlash < 0) return baseScheme + given
-    if ((lastSlash >=0) && (lastSlash < (path.length-1)))
+  if((lastSlash >= 0)
-	path = path.slice(0, lastSlash+1) // Chop trailing filename from base
+    && (lastSlash < (path.length - 1)))
-    
+    path = path.slice(0, lastSlash + 1) // Chop trailing filename from base
-    path = path + given
+  path = path + given
-    while (path.match(/[^\/]*\/\.\.\//)) // must apply to result of prev
+  while(path.match(/[^\/]*\/\.\.\//)) // must apply to result of prev
-	path = path.replace( /[^\/]*\/\.\.\//, '') // ECMAscript spec 7.8.5
+  path = path.replace(/[^\/]*\/\.\.\//, '') // ECMAscript spec 7.8.5
-    path = path.replace( /\.\//g, '') // spec vague on escaping
+  path = path.replace(/\.\//g, '') // spec vague on escaping
-    path = path.replace( /\/\.$/, '/' )
+  path = path.replace(/\/\.$/, '/')
-    return base.slice(0, baseSingle) + path
+  return base.slice(0, baseSingle) + path
 }
 
-var tIOService;
+if(typeof tabulator != 'undefined' && tabulator.isExtension) {
-if (typeof( isExtension ) != "undefined" && isExtension) {
+  $rdf.Util.uri.join2 = function (given, base) {
-    tIOService = Components.classes['@mozilla.org/network/io-service;1']
+    var tIOService = Components.classes['@mozilla.org/network/io-service;1']
-                        .getService(Components.interfaces.nsIIOService);
+      .getService(Components.interfaces.nsIIOService);
-    Util.uri.join2 = function (given, base){
+
-       var baseURI = tIOService.newURI(base, null, null);
+    var baseURI = tIOService.newURI(base, null, null);
-       return tIOService.newURI(baseURI.resolve(given), null, null).spec;
+    return tIOService.newURI(baseURI.resolve(given), null, null).spec;
-    }
+  }
 } else
-    Util.uri.join2 = Util.uri.join;
+  $rdf.Util.uri.join2 = $rdf.Util.uri.join;
-    
+
 //  refTo:    Make a URI relative to a given base
 //
 // based on code in http://www.w3.org/2000/10/swap/uripath.py
 //
-Util.uri.commonHost = new RegExp("^[-_a-zA-Z0-9.]+:(//[^/]*)?/[^/]*$");
+$rdf.Util.uri.commonHost = new RegExp("^[-_a-zA-Z0-9.]+:(//[^/]*)?/[^/]*$");
-Util.uri.refTo = function(base, uri) {
-    if (!base) return uri;
-    if (base == uri) return "";
-    var i =0; // How much are they identical?
-    while (i<uri.length && i < base.length)
-        if (uri[i] == base[i]) i++;
-        else break;
-    if (base.slice(0,i).match(Util.uri.commonHost)) {
-        var k = uri.indexOf('//');
-        if (k<0) k=-2; // no host
-        var l = uri.indexOf('/', k+2);   // First *single* slash
-        if (uri.slice(l+1, l+2) != '/' && base.slice(l+1, l+2) != '/'
-                           && uri.slice(0,l) == base.slice(0,l)) // common path to single slash
-            return uri.slice(l); // but no other common path segments
-    }
-     // fragment of base?
-    if (uri.slice(i, i+1) == '#' && base.length == i) return uri.slice(i);
-    while (i>0 && uri[i-1] != '/') i--;
 
-    if (i<3) return uri; // No way
+$rdf.Util.uri.hostpart = function (u) {
-    if ((base.indexOf('//', i-2) > 0) || uri.indexOf('//', i-2) > 0)
+  var m = /[^\/]*\/\/([^\/]*)\//.exec(u);
-        return uri; // an unshared '//'
+  return m ? m[1] : ''
-    if (base.indexOf(':', i) >0) return uri; // unshared ':'
+};
-    var n = 0;
+
-    for (var j=i; j<base.length; j++) if (base[j]=='/') n++;
+$rdf.Util.uri.refTo = function (base, uri) {
-    if (n==0 && i < uri.length && uri[i] =='#') return './' + uri.slice(i);
+  if(!base) return uri;
-    if (n==0 && i == uri.length) return './';
+  if(base == uri) return "";
-    var str = '';
+  var i = 0; // How much are they identical?
-    for (var j=0; j<n; j++) str+= '../';
+  while(i < uri.length && i < base.length)
-    return str + uri.slice(i);
+  if(uri[i] == base[i]) i++;
+  else break;
+  if(base.slice(0, i).match($rdf.Util.uri.commonHost)) {
+    var k = uri.indexOf('//');
+    if(k < 0) k = -2; // no host
+    var l = uri.indexOf('/', k + 2); // First *single* slash
+    if(uri.slice(l + 1, l + 2) != '/'
+      && base.slice(l + 1, l + 2) != '/'
+      && uri.slice(0, l) == base.slice(0, l))
+      // common path to single slash
+      return uri.slice(l); // but no other common path segments
+  }
+  // fragment of base?
+  if(uri.slice(i, i + 1) == '#' && base.length == i) return uri.slice(i);
+  while(i > 0 && uri[i - 1] != '/') i--;
+
+  if(i < 3) return uri; // No way
+  if((base.indexOf('//', i - 2) > 0)
+    || uri.indexOf('//', i - 2) > 0)
+    return uri; // an unshared '//'
+  if(base.indexOf(':', i) > 0) return uri; // unshared ':'
+  var n = 0;
+  for(var j = i; j < base.length; j++) if(base[j] == '/') n++;
+  if(n == 0 && i < uri.length && uri[i] == '#') return './' + uri.slice(i);
+  if(n == 0 && i == uri.length) return './';
+  var str = '';
+  for(var j = 0; j < n; j++) str += '../';
+  return str + uri.slice(i);
 }
 
 
 /** returns URI without the frag **/
-Util.uri.docpart = function (uri) {
+$rdf.Util.uri.docpart = function (uri) {
-    var i = uri.indexOf("#")
+  var i = uri.indexOf("#")
-    if (i < 0) return uri
+  if(i < 0) return uri
-    return uri.slice(0,i)
+  return uri.slice(0, i)
-} 
+}
+
+/** The document in which something a thing defined  **/
+$rdf.Util.uri.document = function (x) {
+  return $rdf.sym($rdf.Util.uri.docpart(x.uri));
+}
 
 /** return the protocol of a uri **/
 /** return null if there isn't one **/
-Util.uri.protocol = function (uri) {
+$rdf.Util.uri.protocol = function (uri) {
-    var index = uri.indexOf(':');
+  var index = uri.indexOf(':');
-    if (index >= 0)
+  if(index >= 0) return uri.slice(0, index);
-        return uri.slice(0, index);
+  else return null;
-    else
-        return null;
 } //protocol
-
+//ends
-URIjoin = Util.uri.join
-uri_docpart = Util.uri.docpart
-uri_protocol = Util.uri.protocol
-
-
-//ends

chrome/content/zotero/xpcom/sync.js

@@ -1655,6 +1655,10 @@ Zotero.Sync.Server = new function () {
 						}
 					);
 					
+					try {
+						gen.next();
+					}
+					catch (e if e.toString() === "[object StopIteration]") {}
 					Zotero.pumpGenerator(gen, false, errorHandler);
 				}
 				catch (e) {

chrome/content/zotero/xpcom/translation/translate.js

@@ -1054,12 +1054,8 @@ Zotero.Translate.Base.prototype = {
 		try {
 			this._sandboxManager.sandbox["do"+this._entryFunctionSuffix].apply(null, this._getParameters());
 		} catch(e) {
-			if(this._parentTranslator) {
+			this.complete(false, e);
-				throw(e);
+			return false;
-			} else {
-				this.complete(false, e);
-				return false;
-			}
 		}
 		
 		this.decrementAsyncProcesses("Zotero.Translate#translate()");
@@ -2147,7 +2143,7 @@ Zotero.Translate.IO.String.prototype = {
 	
 	"_initRDF":function(callback) {
 		Zotero.debug("Translate: Initializing RDF data store");
-		this._dataStore = new Zotero.RDF.AJAW.RDFIndexedFormula();
+		this._dataStore = new Zotero.RDF.AJAW.IndexedFormula();
 		this.RDF = new Zotero.Translate.IO._RDFSandbox(this._dataStore);
 		
 		if(this.contentLength) {
@@ -2258,9 +2254,9 @@ Zotero.Translate.IO.String.prototype = {
 /**
  * @class An API for handling RDF from the sandbox. This is exposed to translators as Zotero.RDF.
  *
- * @property {Zotero.RDF.AJAW.RDFIndexedFormula} _dataStore
+ * @property {Zotero.RDF.AJAW.IndexedFormula} _dataStore
  * @property {Integer[]} _containerCounts
- * @param {Zotero.RDF.AJAW.RDFIndexedFormula} dataStore
+ * @param {Zotero.RDF.AJAW.IndexedFormula} dataStore
  */
 Zotero.Translate.IO._RDFSandbox = function(dataStore) {
 	this._dataStore = dataStore;
@@ -2281,16 +2277,17 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 		"getArcsOut":"r",
 		"getSources":"r",
 		"getTargets":"r",
-		"getStatementsMatching":"r"
+		"getStatementsMatching":"r",
+		"serialize":"r"
 	},
 	
 	/**
-	 * Gets a resource as a Zotero.RDF.AJAW.RDFSymbol, rather than a string
+	 * Gets a resource as a Zotero.RDF.AJAW.Symbol, rather than a string
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} about
+	 * @param {String|Zotero.RDF.AJAW.Symbol} about
-	 * @return {Zotero.RDF.AJAW.RDFSymbol}
+	 * @return {Zotero.RDF.AJAW.Symbol}
 	 */
 	"_getResource":function(about) {
-		return (typeof about == "object" ? about : new Zotero.RDF.AJAW.RDFSymbol(about));
+		return (typeof about == "object" ? about : new Zotero.RDF.AJAW.Symbol(about));
 	},
 	
 	/**
@@ -2307,7 +2304,7 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 	 * Serializes the current RDF to a string
 	 */
 	"serialize":function(dataMode) {
-		var serializer = Serializer();
+		var serializer = Zotero.RDF.AJAW.Serializer(this._dataStore);
 		
 		for(var prefix in this._dataStore.namespaces) {
 			serializer.suggestPrefix(prefix, this._dataStore.namespaces[prefix]);
@@ -2323,9 +2320,9 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 	
 	/**
 	 * Adds an RDF triple
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} about
+	 * @param {String|Zotero.RDF.AJAW.Symbol} about
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} relation
+	 * @param {String|Zotero.RDF.AJAW.Symbol} relation
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} value
+	 * @param {String|Zotero.RDF.AJAW.Symbol} value
 	 * @param {Boolean} literal Whether value should be treated as a literal (true) or a resource
 	 *     (false)
 	 */
@@ -2352,16 +2349,16 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 	
 	/**
 	 * Creates a new anonymous resource
-	 * @return {Zotero.RDF.AJAW.RDFSymbol}
+	 * @return {Zotero.RDF.AJAW.Symbol}
 	 */
 	"newResource":function() {
-		return new Zotero.RDF.AJAW.RDFBlankNode();
+		return new Zotero.RDF.AJAW.BlankNode();
 	},
 	
 	/**
 	 * Creates a new container resource
 	 * @param {String} type The type of the container ("bag", "seq", or "alt")
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} about The URI of the resource
+	 * @param {String|Zotero.RDF.AJAW.Symbol} about The URI of the resource
 	 * @return {Zotero.Translate.RDF.prototype.newContainer
 	 */
 	"newContainer":function(type, about) {
@@ -2382,8 +2379,8 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 	
 	/**
 	 * Adds a new element to a container
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} about The container
+	 * @param {String|Zotero.RDF.AJAW.Symbol} about The container
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} element The element to add to the container
+	 * @param {String|Zotero.RDF.AJAW.Symbol} element The element to add to the container
 	 * @param {Boolean} literal Whether element should be treated as a literal (true) or a resource
 	 *     (false)
 	 */
@@ -2391,13 +2388,13 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 		const rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
 	
 		var about = this._getResource(about);
-		this._dataStore.add(about, new Zotero.RDF.AJAW.RDFSymbol(rdf+"_"+(this._containerCounts[about.toNT()]++)), element, literal);
+		this._dataStore.add(about, new Zotero.RDF.AJAW.Symbol(rdf+"_"+(this._containerCounts[about.toNT()]++)), element, literal);
 	},
 	
 	/**
 	 * Gets all elements within a container
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} about The container
+	 * @param {String|Zotero.RDF.AJAW.Symbol} about The container
-	 * @return {Zotero.RDF.AJAW.RDFSymbol[]}
+	 * @return {Zotero.RDF.AJAW.Symbol[]}
 	 */
 	"getContainerElements":function(about) {
 		const liPrefix = "http://www.w3.org/1999/02/22-rdf-syntax-ns#_";
@@ -2435,7 +2432,7 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 	
 	/**
 	 * Gets the URI a specific resource
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} resource
+	 * @param {String|Zotero.RDF.AJAW.Symbol} resource
 	 * @return {String}
 	 */
 	"getResourceURI":function(resource) {
@@ -2447,7 +2444,7 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 	
 	/**
 	 * Gets all resources in the RDF data store
-	 * @return {Zotero.RDF.AJAW.RDFSymbol[]}
+	 * @return {Zotero.RDF.AJAW.Symbol[]}
 	 */
 	"getAllResources":function() {
 		var returnArray = [];
@@ -2459,7 +2456,7 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 	
 	/**
 	 * Gets all arcs (predicates) into a resource
-	 * @return {Zotero.RDF.AJAW.RDFSymbol[]}
+	 * @return {Zotero.RDF.AJAW.Symbol[]}
 	 * @deprecated Since 2.1. Use {@link Zotero.Translate.IO["rdf"]._RDFBase#getStatementsMatching}
 	 */
 	"getArcsIn":function(resource) {
@@ -2475,7 +2472,7 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 	
 	/**
 	 * Gets all arcs (predicates) out of a resource
-	 * @return {Zotero.RDF.AJAW.RDFSymbol[]}
+	 * @return {Zotero.RDF.AJAW.Symbol[]}
 	 * @deprecated Since 2.1. Use {@link Zotero.Translate.IO["rdf"]._RDFBase#getStatementsMatching}
 	 */
 	"getArcsOut":function(resource) {
@@ -2491,9 +2488,9 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 	
 	/**
 	 * Gets all subjects whose predicates point to a resource
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} resource Subject that predicates should point to
+	 * @param {String|Zotero.RDF.AJAW.Symbol} resource Subject that predicates should point to
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} property Predicate
+	 * @param {String|Zotero.RDF.AJAW.Symbol} property Predicate
-	 * @return {Zotero.RDF.AJAW.RDFSymbol[]}
+	 * @return {Zotero.RDF.AJAW.Symbol[]}
 	 * @deprecated Since 2.1. Use {@link Zotero.Translate.IO["rdf"]._RDFBase#getStatementsMatching}
 	 */
 	"getSources":function(resource, property) {
@@ -2509,9 +2506,9 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 	
 	/**
 	 * Gets all objects of a given subject with a given predicate
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} resource Subject
+	 * @param {String|Zotero.RDF.AJAW.Symbol} resource Subject
-	 * @param {String|Zotero.RDF.AJAW.RDFSymbol} property Predicate
+	 * @param {String|Zotero.RDF.AJAW.Symbol} property Predicate
-	 * @return {Zotero.RDF.AJAW.RDFSymbol[]}
+	 * @return {Zotero.RDF.AJAW.Symbol[]}
 	 * @deprecated Since 2.1. Use {@link Zotero.Translate.IO["rdf"]._RDFBase#getStatementsMatching}
 	 */
 	"getTargets":function(resource, property) {
@@ -2528,9 +2525,9 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
 	/**
 	 * Gets statements matching a certain pattern
 	 *
-	 * @param	{String|Zotero.RDF.AJAW.RDFSymbol}	subj 		Subject
+	 * @param	{String|Zotero.RDF.AJAW.Symbol}	subj 		Subject
-	 * @param	{String|Zotero.RDF.AJAW.RDFSymbol}	predicate	Predicate
+	 * @param	{String|Zotero.RDF.AJAW.Symbol}	predicate	Predicate
-	 * @param	{String|Zotero.RDF.AJAW.RDFSymbol}	obj			Object
+	 * @param	{String|Zotero.RDF.AJAW.Symbol}	obj			Object
 	 * @param	{Boolean}							objLiteral	Whether the object is a literal (as
 	 *															opposed to a URI)
 	 * @param	{Boolean}							justOne		Whether to stop when a single result is

chrome/content/zotero/xpcom/translation/translate_firefox.js

@@ -684,7 +684,7 @@ Zotero.Translate.IO.Read.prototype = {
 		var baseURI = fileHandler.getURLSpecFromFile(this.file);
 		
 		Zotero.debug("Translate: Initializing RDF data store");
-		this._dataStore = new Zotero.RDF.AJAW.RDFIndexedFormula();
+		this._dataStore = new Zotero.RDF.AJAW.IndexedFormula();
 		var parser = new Zotero.RDF.AJAW.RDFParser(this._dataStore);
 		try {
 			var nodes = Zotero.Translate.IO.parseDOMXML(this._rawStream, this._charset, this.file.fileSize);
@@ -786,7 +786,7 @@ Zotero.Translate.IO.Write.prototype = {
 	
 	"_initRDF":function() {
 		Zotero.debug("Translate: Initializing RDF data store");
-		this._dataStore = new Zotero.RDF.AJAW.RDFIndexedFormula();
+		this._dataStore = new Zotero.RDF.AJAW.IndexedFormula();
 		this.RDF = new Zotero.Translate.IO._RDFSandbox(this._dataStore);
 	},
 	

chrome/content/zotero/xpcom/translation/translate_item.js

@@ -239,22 +239,9 @@ Zotero.Translate.ItemSaver.prototype = {
 			var newItem = Zotero.Items.get(myID);
 		} else {
 			var file = this._parsePath(attachment.path);
-			if(!file) return;
+			if(!file || !file.exists()) return;
 			
-			if (!file.exists()) {
+			if (attachment.url) {
-				// use attachment title if possible, or else file leaf name
-				var title = attachment.title;
-				if(!title) {
-					title = file.leafName;
-				}
-				
-				var myID = Zotero.Attachments.createMissingAttachment(
-					attachment.url ? Zotero.Attachments.LINK_MODE_IMPORTED_URL
-						: Zotero.Attachments.LINK_MODE_IMPORTED_FILE,
-					file, attachment.url ? attachment.url : null, title,
-					attachment.mimeType, attachment.charset, parentID);
-			}
-			else if (attachment.url) {
 				var myID = Zotero.Attachments.importSnapshotFromFile(file,
 					attachment.url, attachment.title, attachment.mimeType, attachment.charset,
 					parentID);

chrome/locale/af-ZA/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicate Selected Item">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "New Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label "More">

chrome/locale/af-ZA/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Enable
 general.disable=Disable
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=There was an error starting Zotero.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
 startupError.checkPermissions=Make sure you have read and write permissions to all files in the Zotero data directory.
@@ -112,6 +113,7 @@ pane.collections.library=My Library
 pane.collections.trash=Trash
 pane.collections.untitled=Untitled
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Rename Collection...
 pane.collections.menu.edit.savedSearch=Edit Saved Search
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Interview by %S et al.
 
 pane.item.selected.zero=No items selected
 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.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:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=last
 pane.item.defaultFullName=full name
 pane.item.switchFieldMode.one=Switch to single field
 pane.item.switchFieldMode.two=Switch to two fields
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Untitled Note
 pane.item.notes.delete.confirm=Are you sure you want to delete this note?
 pane.item.notes.count.zero=%S notes:

chrome/locale/ar/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "تكرار العنصر المحدد">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "عنصر جديد">
 <!ENTITY zotero.toolbar.moreItemTypes.label "المزيد">

chrome/locale/ar/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=تمكين
 general.disable=تعطيل
 general.remove=حذف
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=عملية زوتيرو حاليا في التقدم.
 general.operationInProgress.waitUntilFinished=يرجى الانتظار لحين انتهاء.
@@ -112,6 +113,7 @@ pane.collections.library=مكتبتي
 pane.collections.trash=سلة المحذوفات
 pane.collections.untitled=بدون عنوان
 pane.collections.unfiled=العناصر الغير مصنفة
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=إعادة تسمية مجموعة العناصر...
 pane.collections.menu.edit.savedSearch=تحرير البحث المخزن
@@ -170,6 +172,10 @@ 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.changeType.title=تغيير نوع العنصر
 pane.item.changeType.text=هل ترغب في تغيير نوع العنصر؟\n\nستفقد الحقول التالية:
@@ -178,6 +184,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.notes.untitled=ملاحظة بدون عنوان
 pane.item.notes.delete.confirm=هل ترغب في حذف هذه الملاحظة؟
 pane.item.notes.count.zero=لا توجد ملاحظات:

chrome/locale/bg-BG/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Дуплицира избраните записи">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Нов запис">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Още">

chrome/locale/bg-BG/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Включва
 general.disable=Изключва
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=Операция на Зотеро е активна в момента.
 general.operationInProgress.waitUntilFinished=Моля изчакайте докато приключи.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=Появи се грешка при стартирането на Зотеро.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=Базата дани на зотеро не може да бъде отворена.
 startupError.checkPermissions=Убедете се, че имате разрешение да четете и записвате във всички файлове намиращи се в папката с дани на Зотеро.
@@ -112,6 +113,7 @@ pane.collections.library=Моята библиотека
 pane.collections.trash=Кошче за боклук
 pane.collections.untitled=Без име
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Преименува колекцията...
 pane.collections.menu.edit.savedSearch=Редактира записаното търсене
@@ -170,6 +172,10 @@ 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.changeType.title=Променя типа на записа
 pane.item.changeType.text=Сигурни ли сте, че искате да промените типа на записа?\n\nСледните полета ще бъдат загубени:
@@ -178,6 +184,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.notes.untitled=Бележка без име
 pane.item.notes.delete.confirm=Сигурни ли сте, че искате да изтриете тази бележка?
 pane.item.notes.count.zero=%S бележки:

chrome/locale/ca-AD/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restaura a la Biblioteca">
 <!ENTITY zotero.items.menu.duplicateItem "Duplica l&apos;element seleccionat">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Nou element">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Més">

chrome/locale/ca-AD/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Activa
 general.disable=Desactiva
 general.remove=Elimina
 general.openDocumentation=Obre la documentació
+general.numMore=%S more…
 
 general.operationInProgress=Una operació de Zotero està actualment en curs.
 general.operationInProgress.waitUntilFinished=Si us plau, espereu fins que hagi acabat.
@@ -112,6 +113,7 @@ pane.collections.library=La meva llibreria
 pane.collections.trash=Paperera
 pane.collections.untitled=Sense títol
 pane.collections.unfiled=Ítems sense arxivar
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Canvia el nom de la col·lecció...
 pane.collections.menu.edit.savedSearch=Edita la cerca desada
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Entrevista per %S i altres
 
 pane.item.selected.zero=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.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:
@@ -178,6 +184,8 @@ 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.notes.untitled=Nota sense títol
 pane.item.notes.delete.confirm=Estàs segur que vols eliminar aquesta nota?
 pane.item.notes.count.zero=Cap nota:

chrome/locale/cs-CZ/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Duplikovat vybranou položku">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Nová položka">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Více">

chrome/locale/cs-CZ/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Povolit
 general.disable=Zakázat
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=Právě probíhá operace se Zoterem.
 general.operationInProgress.waitUntilFinished=Počkejte prosím, dokud neskončí.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=Při spouštění aplikace Zotero nastala chyba.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=Databáze Zotera nemohla být otevřena.
 startupError.checkPermissions=Ujistěte se, že máte všechna práva pro čtení a zápis souborů do datového adresáře Zotera.
@@ -112,6 +113,7 @@ pane.collections.library=Moje knihovna
 pane.collections.trash=Koš
 pane.collections.untitled=Nepojmenované
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Přejmenovat kolekci...
 pane.collections.menu.edit.savedSearch=Editovat Uložené hledání
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Rozhovor - %S a další
 
 pane.item.selected.zero=Nebyly vybrány žádné položky
 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.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:
@@ -178,6 +184,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.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:

chrome/locale/da-DK/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicate Selected Item">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "New Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label "More">

chrome/locale/da-DK/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Slå til
 general.disable=Slå fra
 general.remove=Fjern
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=En Zotero-operation er ved at blive udført.
 general.operationInProgress.waitUntilFinished=Vent venligst til den er færdig.
@@ -112,6 +113,7 @@ pane.collections.library=Mit Bibliotek
 pane.collections.trash=Papirkurv
 pane.collections.untitled=Uden navn
 pane.collections.unfiled=Elementer som ikke er gemt.
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Omdøb en Samling...
 pane.collections.menu.edit.savedSearch=Revider en gemt Søgning
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Interview ved %S mfl.
 
 pane.item.selected.zero=Ingen Elementer valgt
 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.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:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=Efternavn
 pane.item.defaultFullName=Udelt navn
 pane.item.switchFieldMode.one=Skift til udelt navnefelt
 pane.item.switchFieldMode.two=Skift til delt navnefelt
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Note uden titel
 pane.item.notes.delete.confirm=Er du sikker på at du vil slette denne Note?
 pane.item.notes.count.zero=%S Noter:

chrome/locale/de/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "In der Bibliothek wiederherstellen">
 <!ENTITY zotero.items.menu.duplicateItem "Ausgewählten Eintrag duplizieren">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Neuer Eintrag">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Mehr">

chrome/locale/de/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Aktivieren
 general.disable=Deaktivieren
 general.remove=Entfernen
 general.openDocumentation=Dokumentation öffnen
+general.numMore=%S more…
 
 general.operationInProgress=Zotero ist beschäftigt.
 general.operationInProgress.waitUntilFinished=Bitte warten Sie, bis der Vorgang abgeschlossen ist.
@@ -112,6 +113,7 @@ pane.collections.library=Meine Bibliothek
 pane.collections.trash=Papierkorb
 pane.collections.untitled=Ohne Titel
 pane.collections.unfiled=Einträge ohne Sammlung
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Sammlung umbenennen...
 pane.collections.menu.edit.savedSearch=Gespeicherte Suche bearbeiten
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Interview von %S et al.
 
 pane.item.selected.zero=Keine Einträge ausgewählt
 pane.item.selected.multiple=%S Einträge ausgewählt
+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.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:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=Name
 pane.item.defaultFullName=vollständiger Name
 pane.item.switchFieldMode.one=Zu einfachem Feld wechseln
 pane.item.switchFieldMode.two=Zu zwei Feldern wechseln
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Notiz ohne Titel
 pane.item.notes.delete.confirm=Sind Sie sicher, dass Sie diese Notiz löschen möchten?
 pane.item.notes.count.zero=%S Notizen:

chrome/locale/el-GR/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicate Selected Item">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "New Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label "More">

chrome/locale/el-GR/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Enable
 general.disable=Disable
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=There was an error starting Zotero.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
 startupError.checkPermissions=Make sure you have read and write permissions to all files in the Zotero data directory.
@@ -112,6 +113,7 @@ pane.collections.library=My Library
 pane.collections.trash=Trash
 pane.collections.untitled=Untitled
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Rename Collection...
 pane.collections.menu.edit.savedSearch=Edit Saved Search
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Interview by %S et al.
 
 pane.item.selected.zero=No items selected
 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.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:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=last
 pane.item.defaultFullName=full name
 pane.item.switchFieldMode.one=Switch to single field
 pane.item.switchFieldMode.two=Switch to two fields
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Untitled Note
 pane.item.notes.delete.confirm=Are you sure you want to delete this note?
 pane.item.notes.count.zero=%S notes:

chrome/locale/es-ES/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicar el ítem seleccionado">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Nuevo ítem">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Más">

chrome/locale/es-ES/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Activar
 general.disable=Desactivar
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=Una operación de Zotero se encuentra en progreso.
 general.operationInProgress.waitUntilFinished=Espera hasta que termine.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=Hubo un error al iniciar Zotero.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 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.
@@ -112,6 +113,7 @@ pane.collections.library=Mi biblioteca
 pane.collections.trash=Trash
 pane.collections.untitled=Sin título
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Renombrar la colección...
 pane.collections.menu.edit.savedSearch=Modificar la carpeta de búsqueda
@@ -170,6 +172,10 @@ 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.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:
@@ -178,6 +184,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.notes.untitled=Nota sin título
 pane.item.notes.delete.confirm=¿Seguro que quieres borrar esta nota?
 pane.item.notes.count.zero=Ninguna nota.

chrome/locale/et-EE/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Taasta raamatukokku">
 <!ENTITY zotero.items.menu.duplicateItem "Valitud kirje duplitseerimine">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Uus kirje">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Veel">

chrome/locale/et-EE/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Lubada
 general.disable=Keelata
 general.remove=Eemaldada
 general.openDocumentation=Dokumentatsiooni avamine
+general.numMore=%S more…
 
 general.operationInProgress=Zotero parajasti toimetab.
 general.operationInProgress.waitUntilFinished=Palun oodake kuni see lõpeb.
@@ -112,6 +113,7 @@ pane.collections.library=Minu raamatukogu
 pane.collections.trash=Praht
 pane.collections.untitled=Nimeta
 pane.collections.unfiled=Teemata kirjed
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Teema ümbernimetamine...
 pane.collections.menu.edit.savedSearch=Salvestatud otsingu toimetamine
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Intervjueerijad %S et al.
 
 pane.item.selected.zero=Kirjeid ei ole valitud
 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.changeType.title=Kirje tüübi muutmine
 pane.item.changeType.text=Soovite kindlasti selle kirje tüüpi muutma?\n\nJärgnevad väljad kustutatakse:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=Perekonnanimi
 pane.item.defaultFullName=Täisnimi
 pane.item.switchFieldMode.one=Ühendväli
 pane.item.switchFieldMode.two=Eraldi väljad
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Nimeta märkus
 pane.item.notes.delete.confirm=Soovite kindlasti seda märkust kustutada?
 pane.item.notes.count.zero=%S märkust:

chrome/locale/eu-ES/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Hautatutako itema bikoiztu">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Item berria">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Gehiago">

chrome/locale/eu-ES/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Gaitu
 general.disable=Ezgaitu
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=Zotero lanean ari da.
 general.operationInProgress.waitUntilFinished=Itxaren ezazu bukatu arte.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=Errore bat gertatu da Zotero abiatzekotan.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=Zotero datu-basea ezin izan da ireki.
 startupError.checkPermissions=Egiaztatu zure irakur eta idazteko baimenak Zotero fitxategiei dagokionez.
@@ -112,6 +113,7 @@ pane.collections.library=Nire Liburutegia
 pane.collections.trash=Zaborra
 pane.collections.untitled=Titulu gabe
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Aldatu bildumaren izena...
 pane.collections.menu.edit.savedSearch=Editatu gordetako bilaketa
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Elkarrizketa %S eta besteek egina
 
 pane.item.selected.zero=Ez da ezer hautatu.
 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.changeType.title=Aldatu item mota
 pane.item.changeType.text=Benetan item mota alduatu?\n\nOndorengo eremuak galduko dira:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=Abizena
 pane.item.defaultFullName=Izen osoa
 pane.item.switchFieldMode.one=Eremu bakarra ezarri
 pane.item.switchFieldMode.two=Eremu bikoitza ezarri
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Izengabeko oharra
 pane.item.notes.delete.confirm=Benetan ezabatu ohar hau?
 pane.item.notes.count.zero=%S ohar:

chrome/locale/fa/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "ساخت رونوشت از این آیتم">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "آیتم‌ جدید">
 <!ENTITY zotero.toolbar.moreItemTypes.label "بیشتر">

chrome/locale/fa/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=فعال
 general.disable=غیرفعال
 general.remove=حذف
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=زوترو در حال انجام کاری است.
 general.operationInProgress.waitUntilFinished=لطفا تا زمان اتمام آن صبر کنید.
@@ -112,6 +113,7 @@ pane.collections.library=کتابخانه
 pane.collections.trash=سطل بازیافت
 pane.collections.untitled=بدون عنوان
 pane.collections.unfiled=آیتم‌های دسته‌بندی نشده
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=تغییر نام مجموعه...
 pane.collections.menu.edit.savedSearch=ویرایش جستجوی ذخیره شده
@@ -170,6 +172,10 @@ 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.changeType.title=تغییر نوع آیتم‌
 pane.item.changeType.text=آیا واقعا می‌خواهید نوع آیتم‌ را عوض کنید؟\n\nاین فیلد‌ها از بین خواهند رفت:
@@ -178,6 +184,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.notes.untitled=یادداشت بی‌عنوان
 pane.item.notes.delete.confirm=آیا واقعا می‌خواهید این یادداشت را حذف کنید؟
 pane.item.notes.count.zero=بدون یادداشت:

chrome/locale/fi-FI/zotero/zotero.dtd

@@ -69,6 +69,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Palauta kirjastoon">
 <!ENTITY zotero.items.menu.duplicateItem "Monista valittu nimike">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Uusi nimike">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Lisää">

chrome/locale/fi-FI/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Laita päälle
 general.disable=Ota pois päältä
 general.remove=Poista
 general.openDocumentation=Avaa käyttöohje
+general.numMore=%S more…
 
 general.operationInProgress=Zoteron toimenpide on käynnissä.
 general.operationInProgress.waitUntilFinished=Odota, kunnes se valmis.
@@ -112,6 +113,7 @@ pane.collections.library=Oma Kirjasto
 pane.collections.trash=Roskakori
 pane.collections.untitled=Nimetön
 pane.collections.unfiled=Lajittelemattomat nimikkeet
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Nimeä kokoelma uudelleen...
 pane.collections.menu.edit.savedSearch=Muokkaa tallennettua hakua
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Haastattelu, tehneet %S ym.
 
 pane.item.selected.zero=Ei valittuja kohteita
 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.changeType.title=Vaihda kohteen tyyppi
 pane.item.changeType.text=Haluatko varmasti vaihtaa kohteen tyypin?\n\nSeuraavat kentät menetetään:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=suku
 pane.item.defaultFullName=koko nimi
 pane.item.switchFieldMode.one=Käytä vain yhtä kenttää
 pane.item.switchFieldMode.two=Käytä kahta kenttää
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Otsikoimaton muistio
 pane.item.notes.delete.confirm=Haluatko varmasti poistaa tämän muistion?
 pane.item.notes.count.zero=%S muistiota:

chrome/locale/fr-FR/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restaurer vers la bibliothèque">
 <!ENTITY zotero.items.menu.duplicateItem "Dupliquer le document sélectionné">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Nouveau document">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Plus">

chrome/locale/fr-FR/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Activer
 general.disable=Désactiver
 general.remove=Supprimer
 general.openDocumentation=Consulter la documentation
+general.numMore=%S more…
 
 general.operationInProgress=Une opération Zotero est actuellement en cours.
 general.operationInProgress.waitUntilFinished=Veuillez attendre jusqu'à ce qu'elle soit terminée.
@@ -112,6 +113,7 @@ pane.collections.library=Ma bibliothèque
 pane.collections.trash=Corbeille
 pane.collections.untitled=Sans titre
 pane.collections.unfiled=Non classés
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Renommer la collection…
 pane.collections.menu.edit.savedSearch=Modifier la recherche enregistrée
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Interview par %S et coll.
 
 pane.item.selected.zero=Aucun document sélectionné
 pane.item.selected.multiple=%S documents sélectionné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.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 :
@@ -178,6 +184,8 @@ pane.item.defaultLastName=Nom
 pane.item.defaultFullName=Nom complet
 pane.item.switchFieldMode.one=Afficher un champ unique
 pane.item.switchFieldMode.two=Afficher deux champs
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Note sans titre
 pane.item.notes.delete.confirm=Voulez-vous vraiment supprimer cette note ?
 pane.item.notes.count.zero=%S note :

chrome/locale/gl-ES/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicar Elementos Seleccionados">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Novo Elemento">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Máis">

chrome/locale/gl-ES/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Activar
 general.disable=Desactivar
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=Está en marcha unha operación Zotero
 general.operationInProgress.waitUntilFinished=Por favor, agarde ata que teña acabado.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=Produciuse un erro ao iniciar Zotero.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=Non pode abrirse a base de datos Zotero.
 startupError.checkPermissions=Asegúrese de ter permisos de lectura e escritura para todos os ficheiros no directorio de datos Zotero.
@@ -112,6 +113,7 @@ pane.collections.library=A Miña Biblioteca
 pane.collections.trash=Lixo
 pane.collections.untitled=Sen título
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Cambiar o Nome da Colección:
 pane.collections.menu.edit.savedSearch=Editar Procura Gravada
@@ -170,6 +172,10 @@ 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.changeType.title=Cambiar Tipo de Elemento
 pane.item.changeType.text=Está seguro de que quere cambiar o tipo de elemento?\n\nPerderanse os campos seguintes :
@@ -178,6 +184,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.notes.untitled=Nota sen título
 pane.item.notes.delete.confirm=Seguro que desexa eliminar esta nota?
 pane.item.notes.count.zero=%S notas:

chrome/locale/he-IL/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicate Selected Item">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "פריט חדש">
 <!ENTITY zotero.toolbar.moreItemTypes.label "More">

chrome/locale/he-IL/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Enable
 general.disable=Disable
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=.Zotero התרחשה שגיאה בעת הפעלת
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
 startupError.checkPermissions=Make sure you have read and write permissions to all files in the Zotero data directory.
@@ -112,6 +113,7 @@ pane.collections.library=הספרייה שלי
 pane.collections.trash=Trash
 pane.collections.untitled=ללא שם
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=שנה שם אוסף
 pane.collections.menu.edit.savedSearch=ערוך חיפושים שמורים
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Interview by %S et al.
 
 pane.item.selected.zero=לא נבחרו פריטים
 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.changeType.title=שנה סוג פריט
 pane.item.changeType.text=Are you sure you want to change the item type?\n\nThe following fields will be lost:
@@ -178,6 +184,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.notes.untitled=Untitled Note
 pane.item.notes.delete.confirm=Are you sure you want to delete this note?
 pane.item.notes.count.zero=%S notes:

chrome/locale/hr-HR/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicate Selected Item">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "New Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label "More">

chrome/locale/hr-HR/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Enable
 general.disable=Disable
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=There was an error starting Zotero.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
 startupError.checkPermissions=Make sure you have read and write permissions to all files in the Zotero data directory.
@@ -112,6 +113,7 @@ pane.collections.library=My Library
 pane.collections.trash=Trash
 pane.collections.untitled=Untitled
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Rename Collection...
 pane.collections.menu.edit.savedSearch=Edit Saved Search
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Interview by %S et al.
 
 pane.item.selected.zero=No items selected
 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.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:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=last
 pane.item.defaultFullName=full name
 pane.item.switchFieldMode.one=Switch to single field
 pane.item.switchFieldMode.two=Switch to two fields
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Untitled Note
 pane.item.notes.delete.confirm=Are you sure you want to delete this note?
 pane.item.notes.count.zero=%S notes:

chrome/locale/hu-HU/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Kiválasztott elem duplikálása">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Új elem">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Egyéb...">

chrome/locale/hu-HU/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Bekapcsolás
 general.disable=Kikapcsolás
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=A Zotero dolgozik.
 general.operationInProgress.waitUntilFinished=Kérjük várjon, amíg a művelet befejeződik.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=Hiba a Zotero indítása közben.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
 startupError.checkPermissions=Győződjön meg róla, hogy a Zotero az adatkönyvtár valamennyi fájlját írni és olvasni tudja.
@@ -112,6 +113,7 @@ pane.collections.library=Teljes könyvtár
 pane.collections.trash=Trash
 pane.collections.untitled=cím nélkül
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Gyűjtemény átnevezése...
 pane.collections.menu.edit.savedSearch=Mentett keresés szerkesztése
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Interjú (készítette: %S et al.)
 
 pane.item.selected.zero=Nincs kiválasztva elem
 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.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.
@@ -178,6 +184,8 @@ pane.item.defaultLastName=vezetéknév
 pane.item.defaultFullName=teljes név
 pane.item.switchFieldMode.one=Váltás egy mezőre
 pane.item.switchFieldMode.two=Váltás két mezőre
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Cím nélküli jegyzet
 pane.item.notes.delete.confirm=Jegyzet törlésének megerősítése?
 pane.item.notes.count.zero=%S jegyzet:

chrome/locale/is-IS/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicate Selected Item">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "New Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label "More">

chrome/locale/is-IS/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Enable
 general.disable=Disable
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=There was an error starting Zotero.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
 startupError.checkPermissions=Make sure you have read and write permissions to all files in the Zotero data directory.
@@ -112,6 +113,7 @@ pane.collections.library=Mitt safn
 pane.collections.trash=Trash
 pane.collections.untitled=Enginn titill
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Endurnefna safn
 pane.collections.menu.edit.savedSearch=Breyta vistaðri leit
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Interview by %S et al.
 
 pane.item.selected.zero=Engar færslur valdar
 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.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:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=síðasta
 pane.item.defaultFullName=fullt nafn
 pane.item.switchFieldMode.one=Switch to single field
 pane.item.switchFieldMode.two=Switch to two fields
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Untitled Note
 pane.item.notes.delete.confirm=Are you sure you want to delete this note?
 pane.item.notes.count.zero=%S notes:

chrome/locale/it-IT/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Ripristina nella biblioteca">
 <!ENTITY zotero.items.menu.duplicateItem "Duplica elemento selezionato">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Nuovo elemento">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Altro">

chrome/locale/it-IT/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Attiva
 general.disable=Disattiva
 general.remove=Rimuovi
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Attendere sino al completamento
@@ -112,6 +113,7 @@ pane.collections.library=Libreria personale
 pane.collections.trash=Cestino
 pane.collections.untitled=Senza titolo
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Rinomina collezione...
 pane.collections.menu.edit.savedSearch=Modifica ricerca salvata
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Intervista di %S e altri
 
 pane.item.selected.zero=Nessun elemento selezionato
 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.changeType.title=Modifica tipo di elemento
 pane.item.changeType.text=Modificare il tipo di elemento? I seguenti campi andranno persi:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=cognome
 pane.item.defaultFullName=nome completo
 pane.item.switchFieldMode.one=Passa a campo unico
 pane.item.switchFieldMode.two=Passa a campo doppio
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Nota senza titolo
 pane.item.notes.delete.confirm=Cancellare questa nota?
 pane.item.notes.count.zero=%S note

chrome/locale/ja-JP/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "ライブラリへ復帰させる">
 <!ENTITY zotero.items.menu.duplicateItem "選択されたアイテムを複製">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "新規アイテム">
 <!ENTITY zotero.toolbar.moreItemTypes.label "その他">

chrome/locale/ja-JP/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=有効化
 general.disable=無効化
 general.remove=取り除く
 general.openDocumentation=ヘルプを開く
+general.numMore=%S more…
 
 general.operationInProgress=既に Zotero 処理が進行中です。
 general.operationInProgress.waitUntilFinished=完了するまでお待ちください。
@@ -112,6 +113,7 @@ pane.collections.library=マイ・ライブラリー
 pane.collections.trash=ゴミ箱
 pane.collections.untitled=無題
 pane.collections.unfiled=未整理のアイテム
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=コレクション名の変更...
 pane.collections.menu.edit.savedSearch=保存済み検索条件を編集する
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=%S et al. によるインタビュー
 
 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.changeType.title=アイテムの種類を変更
 pane.item.changeType.text=アイテムの種類を変更してよろしいですか？\n\n以下のフィールドが失われます:
@@ -178,6 +184,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.notes.untitled=無題のメモ
 pane.item.notes.delete.confirm=このメモを削除してもよろしいですか？
 pane.item.notes.count.zero=メモ（%S）:

chrome/locale/km/zotero/zotero.dtd

@@ -69,6 +69,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "ស្តារទៅកាន់បណ្ណាល័យវិញ">
 <!ENTITY zotero.items.menu.duplicateItem "ជ្រើសរើសឯកសារត្រួត">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "ឯកសារថ្មី">
 <!ENTITY zotero.toolbar.moreItemTypes.label "ជម្រើសប្រភេទឯកសារ">

chrome/locale/km/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=អាចដំណើរការ
 general.disable=មិនអាចដំណើរការ
 general.remove=លុបចោល
 general.openDocumentation=បើកឯកសារ
+general.numMore=%S more…
 
 general.operationInProgress=ហ្ស៊ូតេរ៉ូកំពុងដំណើរការឥលូវនេះ។
 general.operationInProgress.waitUntilFinished=សូមរង់ចាំរហូតដល់ដំណើរការបានបញ្ចប់។
@@ -112,6 +113,7 @@ pane.collections.library=ស្វ័យបណ្ណាល័យ
 pane.collections.trash=ធុងសំរាម
 pane.collections.untitled=ចំណងជើងកម្រងឯកសារ
 pane.collections.unfiled=ឯកសារមិនទាន់បានតម្កល់ទុក
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=ប្តូរឈ្មោះកម្រងឯកសារ...
 pane.collections.menu.edit.savedSearch=កែតម្រូវការស្រាវជ្រាវដែលបានរក្សាទុក
@@ -170,6 +172,10 @@ 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.changeType.title=ផ្លាស់ប្តូរប្រភទឯកសារ
 pane.item.changeType.text=តើអ្នកចង់ផ្លាស់ប្តូរប្រភេទឯកសារ? វិស័យទាំងអស់នេះនឹងត្រូវបាត់បង់ៈ
@@ -178,6 +184,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.notes.untitled=កំណត់ចំណាំគ្មានចំណងជើង
 pane.item.notes.delete.confirm=តើអ្នកចង់លុបកំណត់ចំណាំនេះ?
 pane.item.notes.count.zero=%S កំណត់ចំណាំ:

chrome/locale/ko-KR/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "선택된 항목 복제">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "새 항목">
 <!ENTITY zotero.toolbar.moreItemTypes.label "더 보기">

chrome/locale/ko-KR/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=사용
 general.disable=사용안함
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=Zotero 작업이 현재 진행중입니다.
 general.operationInProgress.waitUntilFinished=끝날때까지 기다려주세요.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=Zotero 시작중 오류가 존재 합니다.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=Zotero 데이터베이스를 열 수 없습니다.
 startupError.checkPermissions=Zotero 자료 디렉토리 내 모든 파일을 읽고 쓸 수 있는 권한을 가지고 있는지 확실하게 확인하세요.
@@ -112,6 +113,7 @@ pane.collections.library=내 라이브러리
 pane.collections.trash=휴지통
 pane.collections.untitled=제목없음
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=수집품 이름변경...
 pane.collections.menu.edit.savedSearch=저장된 검색 목록 편집
@@ -170,6 +172,10 @@ 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.changeType.title=항목 형식 변경
 pane.item.changeType.text=정말로 항목 형식을 변경하길 원하십니까?\n\n다음 필드들을 잃을 수 도 있습니다.
@@ -178,6 +184,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.notes.untitled=무제 노트
 pane.item.notes.delete.confirm=이 노트를 삭제하길 원하는게 맞습니까?
 pane.item.notes.count.zero=%S 노트:

chrome/locale/mn-MN/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicate Selected Item">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Шинэ бүтээл">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Бусад">

chrome/locale/mn-MN/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Enable
 general.disable=Disable
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=There was an error starting Zotero.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
 startupError.checkPermissions=Make sure you have read and write permissions to all files in the Zotero data directory.
@@ -112,6 +113,7 @@ pane.collections.library=Миний номын сан
 pane.collections.trash=Trash
 pane.collections.untitled=Гарчиггүй
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Rename Collection...
 pane.collections.menu.edit.savedSearch=Edit Saved Search
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Interview by %S et al.
 
 pane.item.selected.zero=No items selected
 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.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:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=Сүүлийн
 pane.item.defaultFullName=Бүтэн нэр
 pane.item.switchFieldMode.one=Switch to single field
 pane.item.switchFieldMode.two=Switch to two fields
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Гарчиггүй тэмдэглэл
 pane.item.notes.delete.confirm=Are you sure you want to delete this note?
 pane.item.notes.count.zero=%S тэмдэглэлүүд:

chrome/locale/nb-NO/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Dupliser det valgte elementet">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Nytt element">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Mer">

chrome/locale/nb-NO/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Enable
 general.disable=Disable
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=Det oppstod en feil ved oppstarten av Zotero.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
 startupError.checkPermissions=Make sure you have read and write permissions to all files in the Zotero data directory.
@@ -112,6 +113,7 @@ pane.collections.library=Mitt bibliotek
 pane.collections.trash=Trash
 pane.collections.untitled=Uten tittel
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Gi samlingen nytt navn...
 pane.collections.menu.edit.savedSearch=Rediger lagret søk
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Intervju av %S mfl.
 
 pane.item.selected.zero=Ingen elementer er valgt
 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.changeType.title=Endre elementtype
 pane.item.changeType.text=Vil du virkelig forandre elementtypen?\n\nDe følgende feltene vil bli slettet:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=sist
 pane.item.defaultFullName=fullt navn
 pane.item.switchFieldMode.one=Bytt til ett felt
 pane.item.switchFieldMode.two=Bytt til to felt
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Notat uten tittel
 pane.item.notes.delete.confirm=Er du sikker på at du vil slette dette notatet?
 pane.item.notes.count.zero=%S notater:

chrome/locale/nl-NL/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Terugzetten in bibliotheek">
 <!ENTITY zotero.items.menu.duplicateItem "Kopie maken van geselecteerd object">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Nieuw object">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Meer">

chrome/locale/nl-NL/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Aanzetten
 general.disable=Uitzetten
 general.remove=Verwijderen
 general.openDocumentation=Documentatie openen
+general.numMore=%S more…
 
 general.operationInProgress=Zotero is bezig.
 general.operationInProgress.waitUntilFinished=Wacht tot Zotero klaar is.
@@ -112,6 +113,7 @@ pane.collections.library=Mijn Bibliotheek
 pane.collections.trash=Prullenbak
 pane.collections.untitled=Zonder Titel
 pane.collections.unfiled=Ongesorteerde objecten
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Naam verzameling wijzigen…
 pane.collections.menu.edit.savedSearch=Bewaarde zoekopdracht bewerken
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Interview door %S en anderen
 
 pane.item.selected.zero=Geen objecten geselecteerd
 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.changeType.title=Object-type veranderen
 pane.item.changeType.text=Wilt u het object-type veranderen?\n\nDe volgende velden zullen verloren gaan:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=achternaam
 pane.item.defaultFullName=volledige naam
 pane.item.switchFieldMode.one=Omschakelen naar één veld
 pane.item.switchFieldMode.two=Omschakelen naar twee velden
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Aantekening zonder titel
 pane.item.notes.delete.confirm=Wilt u deze aantekening verwijderen?
 pane.item.notes.count.zero=%S aantekeningen:

chrome/locale/nn-NO/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Gjenopprett til bibliotek">
 <!ENTITY zotero.items.menu.duplicateItem "Dupliser det valde elementet">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Nytt element">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Meir">

chrome/locale/nn-NO/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Slå på
 general.disable=Slå av
 general.remove=Fjern
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=Ei Zotero-handling foregår
 general.operationInProgress.waitUntilFinished=Please wait until it vert hatt finished.
@@ -112,6 +113,7 @@ pane.collections.library=Biblioteket mitt
 pane.collections.trash=Trash
 pane.collections.untitled=Utan tittel
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Gje samlinga nytt namn …
 pane.collections.menu.edit.savedSearch=Rediger lagra søk
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Intervju av %S mfl.
 
 pane.item.selected.zero=Ingen element er valde
 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.changeType.title=Endre elementtype
 pane.item.changeType.text=Vil du verkeleg forandra elementtypen?\n\nDei følgjande vil bli sletta:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=sist
 pane.item.defaultFullName=fullt namn
 pane.item.switchFieldMode.one=Byt til eitt felt
 pane.item.switchFieldMode.two=Byt til to felt
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Notat utan tittel
 pane.item.notes.delete.confirm=Er du sikker på at du vil sletta dette notatet?
 pane.item.notes.count.zero=%S notat:

chrome/locale/pl-PL/zotero/zotero.dtd

@@ -68,6 +68,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.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.toolbar.newItem.label "Nowy element">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Więcej">

chrome/locale/pl-PL/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Włącz
 general.disable=Wyłącz
 general.remove=Usuń
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=Operacja Zotero jest aktualnie w trakcie.
 general.operationInProgress.waitUntilFinished=Proszę poczekać na zakończenie.
@@ -112,6 +113,7 @@ pane.collections.library=Moja biblioteka
 pane.collections.trash=Kosz
 pane.collections.untitled=Bez nazwy
 pane.collections.unfiled=Niepowiązane elementy
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Zmień nazwę kolekcji
 pane.collections.menu.edit.savedSearch=Edytuj wynik wyszukiwania
@@ -170,6 +172,10 @@ 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.changeType.title=Zmień typ elementu
 pane.item.changeType.text=Czy na pewno chcesz zmienić typ elementu?\n\nZostaną utracone następujące pola:
@@ -178,6 +184,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.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

chrome/locale/pt-BR/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restaurar para biblioteca">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicar item selecionado">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Confirmar">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Mais">

chrome/locale/pt-BR/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Habilitar
 general.disable=Desabilitar
 general.remove=Remover
 general.openDocumentation=Abrir documentação
+general.numMore=%S more…
 
 general.operationInProgress=Uma operação Zotero está atualmente em progresso.
 general.operationInProgress.waitUntilFinished=Por favor, aguarde até que ela termine.
@@ -112,6 +113,7 @@ pane.collections.library=Minha biblioteca
 pane.collections.trash=Lixeira
 pane.collections.untitled=Sem título
 pane.collections.unfiled=Documentos sem coleção
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Renomear coleção...
 pane.collections.menu.edit.savedSearch=Editar pesquisa salva
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Entrevista de %S et al.
 
 pane.item.selected.zero=Nenhum item selecionado
 pane.item.selected.multiple=%S itens selecionados
+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.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:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=último
 pane.item.defaultFullName=nome completo
 pane.item.switchFieldMode.one=Mudar para campo único
 pane.item.switchFieldMode.two=Mudar para dois campos
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Nota sem título
 pane.item.notes.delete.confirm=Tem certeza de que deseja excluir esta nota?
 pane.item.notes.count.zero=%S notas:

chrome/locale/pt-PT/zotero/zotero.dtd

@@ -68,6 +68,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.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.toolbar.newItem.label "Novo Item">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Mais">

chrome/locale/pt-PT/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Activar
 general.disable=Desactivar
 general.remove=Remover
 general.openDocumentation=Abrir Documentação
+general.numMore=%S more…
 
 general.operationInProgress=Está em curso uma operação do Zotero.
 general.operationInProgress.waitUntilFinished=Por favor espere que termine.
@@ -112,6 +113,7 @@ pane.collections.library=A minha Biblioteca
 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.menu.rename.collection=Alterar Nome da Colecção...
 pane.collections.menu.edit.savedSearch=Editar Procura Guardada
@@ -170,6 +172,10 @@ 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.changeType.title=Alterar Tipo de Item
 pane.item.changeType.text=Quer mesmo alterar o tipo de item?\n\nPerder-se-á os seguintes campos:
@@ -178,6 +184,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.notes.untitled=Nota Sem Título
 pane.item.notes.delete.confirm=Quer mesmo remover esta nota?
 pane.item.notes.count.zero=%S notas:

chrome/locale/ro-RO/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Fă un duplicat înregistrării selectate">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Înregistrare nouă">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Mai mult">

chrome/locale/ro-RO/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Activare
 general.disable=Dezactivare
 general.remove=Șterge
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 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.
@@ -112,6 +113,7 @@ pane.collections.library=Biblioteca mea
 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.menu.rename.collection=Redenumește colecția...
 pane.collections.menu.edit.savedSearch=Editează căutarea salvată
@@ -170,6 +172,10 @@ 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.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:
@@ -178,6 +184,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.notes.untitled=Notă fără titlu
 pane.item.notes.delete.confirm=Sigur vrei să ștergi această notă?
 pane.item.notes.count.zero=%S note:

chrome/locale/ru-RU/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Восстановить в библиотеке">
 <!ENTITY zotero.items.menu.duplicateItem "Сделать дубликат выбранного документа">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Новый документ">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Далее">

chrome/locale/ru-RU/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Включить
 general.disable=Выключить
 general.remove=Убрать
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=В настоящий момент Zotero выполняет действие.
 general.operationInProgress.waitUntilFinished=Пожалуйста, подождите, пока оно закончится.
@@ -112,6 +113,7 @@ pane.collections.library=Моя библиотека
 pane.collections.trash=Корзина
 pane.collections.untitled=Неназванные
 pane.collections.unfiled=Неподшитые
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Переименовать подборку…
 pane.collections.menu.edit.savedSearch=Редактировать сохраненный поиск
@@ -170,6 +172,10 @@ 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.changeType.title=Изменить тип документа
 pane.item.changeType.text=Вы уверены, что хотите изменить тип документа?\n\nСледующие поля будут утрачены:
@@ -178,6 +184,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.notes.untitled=Заметка без названия
 pane.item.notes.delete.confirm=Вы уверены, что хотите удалить эту заметку?
 pane.item.notes.count.zero=%S заметок:

chrome/locale/sk-SK/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Vrátiť do knižnice">
 <!ENTITY zotero.items.menu.duplicateItem "Duplikovať vybranú položku">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Nová položka">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Viac">

chrome/locale/sk-SK/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Povoliť
 general.disable=Zakázať
 general.remove=Odstrániť
 general.openDocumentation=Otvoriť dokumentáciu
+general.numMore=%S more…
 
 general.operationInProgress=Zotero práve vykonáva operáciu.
 general.operationInProgress.waitUntilFinished=Prosím počkajte, kým sa neukončí.
@@ -112,6 +113,7 @@ pane.collections.library=Moja knižnica
 pane.collections.trash=Kôš
 pane.collections.untitled=Bez názvu
 pane.collections.unfiled=Nezaradené položky
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Premenovať kolekciu...
 pane.collections.menu.edit.savedSearch=Upraviť uložené vyhľadávanie
@@ -170,6 +172,10 @@ 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.changeType.title=Zmeniť typ položky
 pane.item.changeType.text=Naozaj chcete zmeniť typ položky?\n\nNasledujúce polia sa stratia:
@@ -178,6 +184,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.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:

chrome/locale/sl-SI/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Podvoji izbrani vnos">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Nov vnos">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Dodatno">

chrome/locale/sl-SI/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Omogoči
 general.disable=Onemogoči
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=Trenutno je v teku operacija Zotero.
 general.operationInProgress.waitUntilFinished=Počakajte, da se dokonča.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=Pri zagonu Zotera je prišlo do napake.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=Zbirke podatkov Zotero ni mogoče odpreti.
 startupError.checkPermissions=Preverite, da imate pravice branja in pisanja za vse datoteke v podatkovni mapi Zotera.
@@ -112,6 +113,7 @@ pane.collections.library=Moja knjižnica
 pane.collections.trash=Trash
 pane.collections.untitled=Neimenovano
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Preimenuj zbirko ...
 pane.collections.menu.edit.savedSearch=Uredi shranjeno iskanje
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Intervju opravili %S idr.
 
 pane.item.selected.zero=Noben vnos ni izbran
 pane.item.selected.multiple=%S izbranih vnosov
+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.changeType.title=Spremeni vrsto vnosa
 pane.item.changeType.text=Ste prepričani, da želite spremeniti vrsto vnosa?\n\nIzgubljena bodo naslednja polja:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=priimek
 pane.item.defaultFullName=polno ime
 pane.item.switchFieldMode.one=Preklopi na enojno polje
 pane.item.switchFieldMode.two=Preklopi na obe polji
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Neimenovana opomba
 pane.item.notes.delete.confirm=Ste prepričani, da želite izbrisati to opombo?
 pane.item.notes.count.zero=%S opomb:

chrome/locale/sr-RS/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Умножи изабрану ставку">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Нова ставка">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Више">

chrome/locale/sr-RS/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Укључи
 general.disable=Искључи
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=Зотерова операција се обавља.
 general.operationInProgress.waitUntilFinished=Сачекајте док се не заврши.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=Дошло је до грешке приликом покретања Зотера.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
 startupError.checkPermissions=Make sure you have read and write permissions to all files in the Zotero data directory.
@@ -112,6 +113,7 @@ pane.collections.library=Моја библиотека
 pane.collections.trash=Избрисано
 pane.collections.untitled=Безимено
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Преименуј збирку...
 pane.collections.menu.edit.savedSearch=Уреди сачувану претрагу
@@ -170,6 +172,10 @@ 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.changeType.title=Промени врсту ставке
 pane.item.changeType.text=Да ли сте сигурни да желите променити врсту ставке?\n\nСледећа поља ће бити изгубљена:
@@ -178,6 +184,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.notes.untitled=Безимена белешка
 pane.item.notes.delete.confirm=Да ли сте сигурни да желите избрисати ову белешку?
 pane.item.notes.count.zero=%S белешки:

chrome/locale/sv-SE/zotero/zotero.dtd

@@ -69,6 +69,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Duplicera vald post">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Ny post">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Mer">

chrome/locale/sv-SE/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Sätt på
 general.disable=Stäng av
 general.remove=Ta bort
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=Zotero arbetar just nu.
 general.operationInProgress.waitUntilFinished=Vänta till åtgärden är klar.
@@ -112,6 +113,7 @@ pane.collections.library=Mitt bibliotek
 pane.collections.trash=Papperskorg
 pane.collections.untitled=Utan titel
 pane.collections.unfiled=Oregistrerade källor
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Ändra namn på samling...
 pane.collections.menu.edit.savedSearch=Redigera sparad sökning
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Intervju av %S m.fl.
 
 pane.item.selected.zero=Inga källor valda
 pane.item.selected.multiple=%S källor valda
+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.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:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=Efternamn
 pane.item.defaultFullName=Fullständigt namn
 pane.item.switchFieldMode.one=Växla till ett fält
 pane.item.switchFieldMode.two=Växla till två fält
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Anteckning utan titel
 pane.item.notes.delete.confirm=Är du säker på att du vill ta bort den här anteckningen?
 pane.item.notes.count.zero=%S anteckningar:

chrome/locale/th-TH/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "เรียกคืนกลับไลบรารี่">
 <!ENTITY zotero.items.menu.duplicateItem "ทำซ้ำรายการที่เลือก">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "รายการใหม่">
 <!ENTITY zotero.toolbar.moreItemTypes.label "มากกว่า">

chrome/locale/th-TH/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=ใช้งาน
 general.disable=ไม่ใช้งาน
 general.remove=ลบออก
 general.openDocumentation=เปิดการทำเอกสาร
+general.numMore=%S more…
 
 general.operationInProgress=Zotero กำลังดำเนินการอยู่
 general.operationInProgress.waitUntilFinished=กรุณารอจนกว่าจะเสร็จ
@@ -112,6 +113,7 @@ pane.collections.library=ไลบรารีของฉัน
 pane.collections.trash=ถังขยะ
 pane.collections.untitled=ยังไม่ตั้งชื่อเรื่อง
 pane.collections.unfiled=รายการที่ไม่จัดกลุ่ม
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=เปลี่ยนชื่อคอลเล็กชั่น...
 pane.collections.menu.edit.savedSearch=แก้ไขบันทึกผลการค้นหา
@@ -170,6 +172,10 @@ 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.changeType.title=เปลี่ยนประเภทรายการ
 pane.item.changeType.text=คุณต้องการเปลี่ยนประเภทรายการใช่หรือไม่?\n\nฟีลด์ต่อไปนี้จะสูญหาย:
@@ -178,6 +184,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.notes.untitled=หมายเหตุไม่มีชื่อเรื่อง
 pane.item.notes.delete.confirm=คุณต้องการลบหมายเหตุนี้ใช่หรือไม่?
 pane.item.notes.count.zero=%S หมายเหตุ:

chrome/locale/tr-TR/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Kitaplığa geri yükle">
 <!ENTITY zotero.items.menu.duplicateItem "Seçili Eseri Çoğalt">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Yeni Eser">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Daha Fazla">

chrome/locale/tr-TR/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Seçilir Kıl:
 general.disable=Seçilemez Kıl
 general.remove=Kaldır
 general.openDocumentation=Bilgilemeyi Aç
+general.numMore=%S more…
 
 general.operationInProgress=Zotero işlemi çalışıyor.
 general.operationInProgress.waitUntilFinished=Lütfen bitene kadar bekleyiniz.
@@ -112,6 +113,7 @@ pane.collections.library=Kitaplığım
 pane.collections.trash=Çöp
 pane.collections.untitled=İsimsiz
 pane.collections.unfiled=Dosyalanmamış Eserler
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Dermeyi yeniden adlandır...
 pane.collections.menu.edit.savedSearch=Kaydedilen Aramayı Düzenle
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Görüşme %S ve tümü
 
 pane.item.selected.zero=Hiçbir Eser Seçilmedi
 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.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:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=son
 pane.item.defaultFullName=tam isim
 pane.item.switchFieldMode.one=Tek alana geç
 pane.item.switchFieldMode.two=İki alana geç
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Başlıksız Not
 pane.item.notes.delete.confirm=Bu notu silmek istediğinize emin misiniz?
 pane.item.notes.count.zero=%S not:

chrome/locale/vi-VN/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem "Sao chép Biểu ghi vừa chọn">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "Biểu ghi mới">
 <!ENTITY zotero.toolbar.moreItemTypes.label "Khác">

chrome/locale/vi-VN/zotero/zotero.properties

@@ -36,6 +36,7 @@ general.enable=Enable
 general.disable=Disable
 general.remove=Remove
 general.openDocumentation=Open Documentation
+general.numMore=%S more…
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -80,7 +81,7 @@ app.firefox=Zotero for Firefox
 
 startupError=Đã có một lỗi khi đang khởi động Zotero.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
+startupError.closeStandalone=If Zotero Standalone is open, please close it and restart %S.
 startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
 startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
 startupError.checkPermissions=Make sure you have read and write permissions to all files in the Zotero data directory.
@@ -112,6 +113,7 @@ pane.collections.library=Thư viện của Tôi
 pane.collections.trash=Trash
 pane.collections.untitled=Vô danh
 pane.collections.unfiled=Unfiled Items
+pane.collections.duplicate=Duplicate Items
 
 pane.collections.menu.rename.collection=Đổi tên Bộ sưu tập...
 pane.collections.menu.edit.savedSearch=Soạn thảo Tìm kiếm Định sẵn
@@ -170,6 +172,10 @@ pane.items.interview.manyParticipants=Phỏng vấn bởi %S và cs
 
 pane.item.selected.zero=Chưa chọn biểu ghi nào
 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.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:
@@ -178,6 +184,8 @@ pane.item.defaultLastName=họ
 pane.item.defaultFullName=tên đầy đủ
 pane.item.switchFieldMode.one=Chuyển thành một trường đơn
 pane.item.switchFieldMode.two=Chuyển thành hai trường
+pane.item.creator.moveUp=Move Up
+pane.item.creator.moveDown=Move Down
 pane.item.notes.untitled=Ghi chép Vô danh
 pane.item.notes.delete.confirm=Bạn có chắc bạn muốn xóa ghi chép này?
 pane.item.notes.count.zero=%S ghi chép:

chrome/locale/zh-CN/zotero/zotero.dtd

@@ -68,6 +68,10 @@
 
 <!ENTITY zotero.items.menu.restoreToLibrary "还原">
 <!ENTITY zotero.items.menu.duplicateItem "生成所选条目复件">
+<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+
+<!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.toolbar.newItem.label "新建条目">
 <!ENTITY zotero.toolbar.moreItemTypes.label "更多">