Merge r1047 through r1063 back to branch

2007-01-08 09:33:36 +00:00 · 2007-01-08 09:33:36 +00:00 · 62f273e034
commit 62f273e034
parent 1bfa4425bd
20 changed files with 881 additions and 140 deletions
--- a/chrome.manifest
+++ b/chrome.manifest
@ -1,9 +1,20 @@
 content	zotero				chrome/content/zotero/
+
 locale	zotero	en-US		chrome/locale/en-US/zotero/
 locale	zotero	zh-CN		chrome/locale/zh-CN/zotero/
 locale	zotero	de-DE		chrome/locale/de-DE/zotero/
-skin	zotero	default		chrome/skin/default/zotero/
+locale	zotero	de-AT		chrome/locale/de-AT/zotero/
+locale	zotero	de-CH		chrome/locale/de-CH/zotero/
+locale	zotero	fr-FR		chrome/locale/fr-FR/zotero/
+locale	zotero	it-IT		chrome/locale/it-IT/zotero/
+locale	zotero	ja-JP		chrome/locale/ja-JP/zotero/
+locale	zotero	ko-KR		chrome/locale/ko-KR/zotero/
+locale	zotero	nb-NO		chrome/locale/nb-NO/zotero/
+locale	zotero	nl-NL		chrome/locale/nl-NL/zotero/
+locale	zotero	sr-YU		chrome/locale/sr-YU/zotero/
+
+skin		zotero	default		chrome/skin/default/zotero/

 overlay	chrome://browser/content/browser.xul	chrome://zotero/content/overlay.xul
 style	chrome://browser/content/browser.xul	chrome://zotero/skin/zotero.css
-style	chrome://global/content/customizeToolbar.xul	chrome://zotero/skin/zotero.css
+style	chrome://global/content/customizeToolbar.xul	chrome://zotero/skin/zotero.css
--- a/chrome/content/zotero/bindings/tagselector.xml
+++ b/chrome/content/zotero/bindings/tagselector.xml
@ -37,6 +37,7 @@
 			<field name="_notifierID">false</field>
 			<field name="_tags">null</field>
 			<field name="_dirty">null</field>
+			<field name="_empty">null</field>
 			<field name="selection"/>
 			
 			<field name="_hasFilter">false</field>
@ -108,7 +109,7 @@
 				<![CDATA[
 					this._initialized = true;
 					this.selection = {};
-					this._notifierID = Zotero.Notifier.registerObserver(this);
+					this._notifierID = Zotero.Notifier.registerObserver(this, ['collection-item', 'item-tag', 'tag']);
 				]]>
 				</body>
 			</method>
@ -219,6 +220,16 @@
 							else {
 								//Zotero.debug(5);
 								labels[i].setAttribute('inScope', false);
+								
+								// If out of scope, make sure it's not selected (otherwise a tag
+								// stays selected after removing an item with that tag from the
+								// current collection)
+								if (this.selection[labels[i].value]) {
+									labels[i].setAttribute('selected', false);
+									delete this.selection[labels[i].value];
+									var doCommand = true;
+								}
+
 							}
 							
 							labels[i].setAttribute('hidden', false);
@ -226,21 +237,37 @@
 						}
 					}
 					
+					
 					this.updateNumSelected();
+					this._empty = empty;
 					this.id('tags-toggle').setAttribute('collapsed', empty);
 					this.id('no-tags-box').setAttribute('collapsed', !empty);
+					
+					if (doCommand) {
+						Zotero.debug('A selected tag went out of scope -- deselecting');
+						this.doCommand();
+					}
 				]]>
 				</body>
 			</method>
 			
 			
-			<method name="updateNumSelected">
+			<method name="getNumSelected">
 				<body>
 				<![CDATA[
 					var count = 0;
 					for (var i in this.selection) {
 						count++;
 					}
+					return count;
+				]]>
+				</body>
+			</method>
+			
+			<method name="updateNumSelected">
+				<body>
+				<![CDATA[
+					var count = this.getNumSelected();
 					
 					switch (count) {
 						case 0:
@ -265,13 +292,35 @@
 				<parameter name="ids"/>
 				<body>
 				<![CDATA[
+					// If a selected tag no longer exists, deselect it
+					if (event == 'delete') {
+						this._tags = Zotero.Tags.getAll();
+						
+						for (var tag in this.selection) {
+							for each(var tag2 in this._tags) {
+								if (tag == tag2) {
+									var found = true;
+									break;
+								}
+							}
+							if (!found) {
+								delete this.selection[tag];
+							}
+						}
+					}
+					
 					// This could be more optimized to insert new/changed tags at the appropriate
 					// spot if we cared, but we probably don't
-					if (type == 'collection-item' || type == 'item-tag' || type == 'tag') {
-						var t = this.id('tags-search').inputField;
-						this.setFilterTags(Zotero.Tags.search(t.value), true);
-						this._dirty = true;
-						this.doCommand();
+					var t = this.id('tags-search').inputField;
+					this.setFilterTags(Zotero.Tags.search(t.value), true);
+					this._dirty = true;
+					this.doCommand();
+					
+					// If no tags visible after a delete, deselect all
+					if ((event == 'remove' || event == 'delete') &&
+							this._empty && this.getNumSelected()) {
+						Zotero.debug('No tags visible after delete -- deselecting all');
+						this.clearAll();
 					}
 				]]>
 				</body>
@ -309,7 +358,7 @@
 							delete this.selection[labels[i].value];
 						}
 						
-						// Bubbles up to command
+						this.doCommand();
 					]]>
 				</body>
 			</method>
@ -539,7 +588,7 @@
 					<xul:toolbarseparator/>
 					<xul:hbox pack="center">
 						<xul:button label="&zotero.tagSelector.clearAll;"
-							oncommand="this.parentNode.parentNode.parentNode.parentNode.clearAll();"/>
+							oncommand="this.parentNode.parentNode.parentNode.parentNode.clearAll(); event.stopPropagation();"/>
 					</xul:hbox>
 				</xul:hbox>
 			</xul:groupbox>
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@ -38,6 +38,7 @@ var ZoteroPane = new function()
 	this.newCollection = newCollection;
 	this.newSearch = newSearch;
 	this.toggleTagSelector = toggleTagSelector;
+	this.updateTagSelectorSize = updateTagSelectorSize;
 	this.getTagSelection = getTagSelection;
 	this.updateTagFilter = updateTagFilter;
 	this.onCollectionSelected = onCollectionSelected;
@ -99,6 +100,7 @@ var ZoteroPane = new function()
 			newSplitter.setAttribute('collapsed',true);
 			newSplitter.setAttribute('resizebefore','closest');
 			newSplitter.setAttribute('resizeafter','closest');
+			newSplitter.setAttribute('onmouseup', 'ZoteroPane.updateTagSelectorSize()');
 			appContent.removeChild(oldSplitter);
 			appContent.insertBefore(newSplitter, document.getElementById('content'));
 			
@ -114,6 +116,8 @@ var ZoteroPane = new function()
 		var itemsTree = document.getElementById('zotero-items-tree');
 		itemsTree.controllers.appendController(new Zotero.ItemTreeCommandController(itemsTree));
 		
+		this.updateTagSelectorSize();
+		
 		// Create the New Item (+) menu with each item type
 		var addMenu = document.getElementById('zotero-tb-add').firstChild;
 		var separator = document.getElementById('zotero-tb-add').firstChild.firstChild;
@ -316,12 +320,16 @@ var ZoteroPane = new function()
 	
 	
 	function toggleTagSelector(){
+		var zoteroPane = document.getElementById('zotero-pane');
 		var tagSelector = document.getElementById('zotero-tag-selector');
-		var collapsed = tagSelector.getAttribute('collapsed')=='true';
-		tagSelector.setAttribute('collapsed', !collapsed);
+		
+		var showing = tagSelector.getAttribute('collapsed') == 'true';
+		tagSelector.setAttribute('collapsed', !showing);
+		this.updateTagSelectorSize();
+		
 		// If showing, set scope to items in current view
 		// and focus filter textbox
-		if (collapsed) {
+		if (showing) {
 			_setTagScope();
 			tagSelector.focusTextbox();
 		}
@ -332,6 +340,36 @@ var ZoteroPane = new function()
 	}
 	
 	
+	function updateTagSelectorSize() {
+		var zoteroPane = document.getElementById('zotero-pane');
+		var tagSelector = document.getElementById('zotero-tag-selector');
+		
+		height = tagSelector.boxObject.height;
+		
+		/*
+		Zotero.debug(tagSelector.boxObject.height);
+		Zotero.debug(tagSelector.getAttribute('height'));
+		Zotero.debug(zoteroPane.boxObject.height);
+		Zotero.debug(zoteroPane.getAttribute('height'));
+		*/
+		
+		// Don't let the Z-pane jump back down to its previous height
+		// (if shrinking or hiding the tag selector let it clear the min-height)
+		if (zoteroPane.getAttribute('height') < zoteroPane.boxObject.height) {
+			zoteroPane.setAttribute('height', zoteroPane.boxObject.height);
+		}
+		
+		if (tagSelector.getAttribute('collapsed') != 'true' && !height) {
+			height = parseInt(tagSelector.getAttribute('height'));
+		}
+		
+		// 170px is the Z-pane min-height sans tag selector; 120px seems to be
+		// enough room for the toolbar and collections tree at minimum height
+		//Zotero.debug('Setting tag selector minheight to ' + (Math.max(170, 120 + height)));
+		zoteroPane.setAttribute('minheight', Math.max(170, 120 + height));
+	}
+	
+	
 	function getTagSelection(){
 		var tagSelector = document.getElementById('zotero-tag-selector');
 		return tagSelector.selection ? tagSelector.selection : {};
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@ -63,7 +63,9 @@
 	
 	<vbox id="appcontent">
 		<!-- Changes to attributes of zotero-splitter and zotero-pane must be mirrored on overlay.js's onLoad() function -->
-		<splitter id="zotero-splitter" resizebefore="closest" resizeafter="closest" collapsed="true"/>
+		<!-- onmouseup shouldn't be necessary but seems to help prevent tag selector from sometimes going off the screen -->
+		<splitter id="zotero-splitter" resizebefore="closest" resizeafter="closest" collapsed="true"
+			onmouseup="ZoteroPane.updateTagSelectorSize()"/>
 		<hbox id="zotero-pane" persist="height" collapsed="true">
 			<popupset>
 				<popup id="zotero-collectionmenu" onpopupshowing="ZoteroPane.buildCollectionContextMenu();">
@ -97,39 +99,43 @@
 			</popupset>
 			
 			<vbox id="zotero-collections-pane" persist="width" flex="1">
-				<toolbar>
-					<toolbarbutton id="zotero-tb-collection-add" tooltiptext="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane.newCollection()"/>
-					<toolbarbutton id="zotero-tb-collection-addsearch" tooltiptext="&zotero.toolbar.newSavedSearch.label;" oncommand="ZoteroPane.newSearch();"/>
-					<spacer flex="1"/>
-					<toolbarbutton id="zotero-tb-tag-selector" tooltiptext="&zotero.toolbar.tagSelector.label;" oncommand="ZoteroPane.toggleTagSelector()"/>
-					<toolbarbutton id="zotero-tb-actions-menu" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
-						<menupopup id="zotero-tb-actions-popup">
-							<menuitem id="zotero-tb-actions-import" label="&zotero.toolbar.import.label;" oncommand="Zotero_File_Interface.importFile();"/>
-							<menuitem id="zotero-tb-actions-export" label="&zotero.toolbar.export.label;" oncommand="Zotero_File_Interface.exportFile();"/>
-							<menuseparator id="zotero-tb-actions-utilities-separator" hidden="true"/>
-							<menuseparator id="zotero-tb-actions-separator"/>
-							<menuitem id="zotero-tb-actions-prefs" label="&zotero.toolbar.preferences.label;"
-								oncommand="window.openDialog('chrome://zotero/content/preferences.xul', 'zotero-prefs', 'chrome,titlebar,toolbar,' + Zotero.Prefs.get('browser.preferences.instantApply', true) ? 'dialog=no' : 'modal')"/>
-							<menuitem id="zotero-tb-actions-about" label="&zotero.toolbar.about.label;" oncommand="window.openDialog('chrome://zotero/content/about.xul', 'about', 'chrome')"/>
-						</menupopup>
-					</toolbarbutton>
-				</toolbar>
-				<tree id="zotero-collections-tree" hidecolumnpicker="true" context="zotero-collectionmenu"
-					onselect="ZoteroPane.onCollectionSelected();" seltype="single"
-					ondragdrop="nsDragAndDrop.drop(event,ZoteroPane.getCollectionsView())"
-					ondraggesture="if (event.target.localName == 'treechildren') nsDragAndDrop.startDrag(event,ZoteroPane.getCollectionsView());"
-					onkeypress="if (event.keyCode == event.DOM_VK_BACK_SPACE || event.keyCode == event.DOM_VK_DELETE){ ZoteroPane.deleteSelectedCollection(); event.preventDefault(); }"
-					flex="1">
-					<treecols>
-						<treecol
-							id="zotero-collections-name-column"
-							label="&zotero.collections.name_column;"
-							flex="1"
-							primary="true"/>
-					</treecols>
-					<treechildren/>
-				</tree>
-				<splitter id="zotero-tags-splitter"/>
+				<!-- This extra vbox prevents the toolbar from getting compressed when resizing
+						the tag selector to max height -->
+				<vbox flex="1">
+					<toolbar>
+						<toolbarbutton id="zotero-tb-collection-add" tooltiptext="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane.newCollection()"/>
+						<toolbarbutton id="zotero-tb-collection-addsearch" tooltiptext="&zotero.toolbar.newSavedSearch.label;" oncommand="ZoteroPane.newSearch();"/>
+						<spacer flex="1"/>
+						<toolbarbutton id="zotero-tb-tag-selector" tooltiptext="&zotero.toolbar.tagSelector.label;" oncommand="ZoteroPane.toggleTagSelector()"/>
+						<toolbarbutton id="zotero-tb-actions-menu" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
+							<menupopup id="zotero-tb-actions-popup">
+								<menuitem id="zotero-tb-actions-import" label="&zotero.toolbar.import.label;" oncommand="Zotero_File_Interface.importFile();"/>
+								<menuitem id="zotero-tb-actions-export" label="&zotero.toolbar.export.label;" oncommand="Zotero_File_Interface.exportFile();"/>
+								<menuseparator id="zotero-tb-actions-utilities-separator" hidden="true"/>
+								<menuseparator id="zotero-tb-actions-separator"/>
+								<menuitem id="zotero-tb-actions-prefs" label="&zotero.toolbar.preferences.label;"
+									oncommand="window.openDialog('chrome://zotero/content/preferences.xul', 'zotero-prefs', 'chrome,titlebar,toolbar,' + Zotero.Prefs.get('browser.preferences.instantApply', true) ? 'dialog=no' : 'modal')"/>
+								<menuitem id="zotero-tb-actions-about" label="&zotero.toolbar.about.label;" oncommand="window.openDialog('chrome://zotero/content/about.xul', 'about', 'chrome')"/>
+							</menupopup>
+						</toolbarbutton>
+					</toolbar>
+					<tree id="zotero-collections-tree" hidecolumnpicker="true" context="zotero-collectionmenu"
+						onselect="ZoteroPane.onCollectionSelected();" seltype="single"
+						ondragdrop="nsDragAndDrop.drop(event,ZoteroPane.getCollectionsView())"
+						ondraggesture="if (event.target.localName == 'treechildren') nsDragAndDrop.startDrag(event,ZoteroPane.getCollectionsView());"
+						onkeypress="if (event.keyCode == event.DOM_VK_BACK_SPACE || event.keyCode == event.DOM_VK_DELETE){ ZoteroPane.deleteSelectedCollection(); event.preventDefault(); }"
+						flex="1">
+						<treecols>
+							<treecol
+								id="zotero-collections-name-column"
+								label="&zotero.collections.name_column;"
+								flex="1"
+								primary="true"/>
+						</treecols>
+						<treechildren/>
+					</tree>
+				</vbox>
+				<splitter id="zotero-tags-splitter" onmouseup="ZoteroPane.updateTagSelectorSize()"/>
 				<zoterotagselector id="zotero-tag-selector" persist="height,collapsed" oncommand="ZoteroPane.updateTagFilter()"/>
 			</vbox>
 			
--- a/chrome/content/zotero/test/test.js
+++ b/chrome/content/zotero/test/test.js
@ -1 +1,71 @@
+function onDone(xmlhttp, manual){
+	var translatorUpdates = xmlhttp.responseXML.getElementsByTagName('translator');
+	var styleUpdates = xmlhttp.responseXML.getElementsByTagName('style');
+	
+	if (!translatorUpdates.length && !styleUpdates.length){
+		Zotero.debug('All translators and styles are up-to-date');
+		return -1;
+	}
+	
+	//xmlhttp.responseXML.normalize();
+	
+	for (var i=0, len=translatorUpdates.length; i<len; i++){
+		Zotero.debug( translatorUpdates[i].getElementsByTagName('code')[0].firstChild.nodeValue );
+		Zotero.debug( translatorUpdates[i].getElementsByTagName('code')[0].childNodes.length );
+		Zotero.debug('-----------------------------');
+		Zotero.debug('-----------------------------');
+		continue;
+		
+		/*
+		var codeNode = translatorUpdates[i].getElementsByTagName('code')[0];
+		var code = '';
+		for (var j=0; j<codeNode.childNodes.length; j++){
+			code += codeNode.childNodes[j].nodeValue;
+		}
+		*/
+		Zotero.debug(code);
+		Zotero.debug('-----------------------------');
+	}
+}

+function doGo(s){
+	Zotero.Utilities.HTTP.doGet('http://www.zotero.org/repo/fetch/' + s, onDone);
+}
+
+
+function compareVersions(a,b) {
+ var x = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
+                   .getService(Components.interfaces.nsIVersionComparator)
+                   .compare(a,b);
+ if(x == 0)
+   return a + "==" + b;
+ else if(x > 0)
+   return a + ">" + b;
+ return a + "<" + b;
+}
+//Zotero.debug(compareVersions("1.0.0b3.r1*", "1.0.0b3.r1.SVN"));
+
+//Zotero.Utilities.HTTP.doGet('http://www.zotero.org/repo/fetch/96b9f483-c44d-5784-cdad-ce21b984fe01', onDone);
+//Zotero.Utilities.HTTP.doGet('http://www.zotero.org/repo/fetch', onDone);
+
+function pickFile(){
+        const nsIFilePicker = Components.interfaces.nsIFilePicker;
+
+        var fp = Components.classes["@mozilla.org/filepicker;1"]
+                .createInstance(nsIFilePicker);
+        fp.init(window, "Dialog Title", nsIFilePicker.modeGetFile);
+        fp.appendFilters(nsIFilePicker.filterAll | nsIFilePicker.filterText);
+
+        var rv = fp.show();
+        if (rv == nsIFilePicker.returnOK){
+                return fp.file;
+        }
+}
+
+
+/*
+var rows = Zotero.DB.columnQuery("SELECT translatorID FROM translators");
+for each(var row in rows){
+	doGo(row.substr(0, 32));
+}
+*/
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@ -207,7 +207,11 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids)
 				else
 				{
 					var item = Zotero.Items.get(ids[i]);
-					
+					if (!item) {
+						// DEBUG: this shouldn't really happen but could if a
+						// modify comes in after a delete
+						continue;
+					}
 					if(item.isRegularItem() || !item.getSource())
 					{
 						//most likely, the note or attachment's parent was removed.
@ -840,14 +844,24 @@ Zotero.ItemTreeView.prototype.getSortedItems = function() {
 }

 Zotero.ItemTreeView.prototype.getSortField = function() {
-	var col = this._treebox.columns.getSortedColumn().id;
+	var column = this._treebox.columns.getSortedColumn()
+	if (!column) {
+		return false;
+	}
 	// zotero.items._________.column
-	return col.substring(13, col.length-7);
+	return column.substring(13, column.length-7);
 }


+/*
+ * Returns 'ascending' or 'descending'
+ */
 Zotero.ItemTreeView.prototype.getSortDirection = function() {
-	return this._treebox.columns.getSortedColumn().element.getAttribute('sortDirection');
+	var column = this._treebox.columns.getSortedColumn();
+	if (!column) {
+		return 'ascending';
+	}
+	return column.element.getAttribute('sortDirection');
 }


--- a/chrome/content/zotero/xpcom/notifier.js
+++ b/chrome/content/zotero/xpcom/notifier.js
@ -267,6 +267,9 @@ Zotero.Notifier = new function(){
 	}
 	
 	
+	/*
+	 * These should probably no longer be used now that we have event queuing
+	 */
 	function disable(){
 		Zotero.debug('Disabling Notifier notifications');
 		_disabled = true;
--- a/chrome/locale/ko-KR/zotero/about.dtd
+++ b/chrome/locale/ko-KR/zotero/about.dtd
@ -0,0 +1,7 @@
+<!ENTITY zotero.version "버전">
+<!ENTITY zotero.createdby "제작자:">
+<!ENTITY zotero.directors "감독:">
+<!ENTITY zotero.developers "개발자:">
+<!ENTITY zotero.executiveProducer "행정 감독:">
+<!ENTITY zotero.thanks "감사드릴 분들:">
+<!ENTITY zotero.about.close "닫기">
--- a/chrome/locale/ko-KR/zotero/locales.xml
+++ b/chrome/locale/ko-KR/zotero/locales.xml
@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<terms xmlns="http://purl.org/net/xbiblio/csl">
+  <locale xml:lang="ko">
+    <term name="in">in</term>
+    <term name="ibid">ibid</term>
+    <term name="accessed">접근된</term>
+    <term name="retrieved">retrieved</term>
+    <term name="from">(으)로부터</term>
+    <term name="forthcoming">근간</term>
+    <term name="references">참고 문헌</term>
+    <term name="no date">일자 없음</term>
+    <term name="and">와/과</term>
+    <term name="et-al">기타</term>
+    
+    <!-- LONG LOCATOR FORMS -->
+    <term name="page">
+      <single>페이지</single>
+      <multiple>페이지</multiple>
+    </term>
+    <term name="paragraph">
+      <single>단락</single>
+      <multiple>단락</multiple>
+    </term>
+    <term name="line">
+      <single>행</single>
+      <multiple>행</multiple>
+    </term>
+    <term name="volume">권</term>
+    <term name="issue">호</term>
+    
+    <!-- SHORT LOCATOR FORMS -->
+    <term name="page" form="short">
+      <single>p</single>
+      <multiple>pp</multiple>
+    </term>
+    <term name="paragraph" form="short">
+      <single>¶</single>
+      <multiple>¶¶</multiple>
+    </term>
+    <term name="line" form="short">
+      <single>행</single>
+      <multiple>행</multiple>
+    </term>
+    <term name="volume" form="short">권</term>
+    <term name="issue" form="short">호</term>
+    
+    <!-- LONG ROLE FORMS -->
+    <term name="editor">
+      <single>편집자</single>
+      <multiple>편집자</multiple>
+    </term>
+    <term name="translator">
+      <single>번역자</single>
+      <multiple>번역자</multiple>
+    </term>
+    
+    <!-- SHORT ROLE FORMS -->
+    <term name="editor" form="short">
+      <single>편집자</single>
+      <multiple>편집자</multiple>
+    </term>
+    <term name="translator" form="short">
+      <single>번역자</single>
+      <multiple>번역자</multiple>
+    </term>
+    
+    <!-- VERB ROLE FORMS -->
+    <term name="editor" form="verb">편집자：</term>
+    <term name="translator" form="verb">번역자：</term>
+    
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01">1월</term>
+    <term name="month-02">2월</term>
+    <term name="month-03">3월</term>
+    <term name="month-04">4월</term>
+    <term name="month-05">5월</term>
+    <term name="month-06">6월</term>
+    <term name="month-07">7월</term>
+    <term name="month-08">8월</term>
+    <term name="month-09">9월</term>
+    <term name="month-10">10월</term>
+    <term name="month-11">11월</term>
+    <term name="month-12">12월</term>
+    
+    <!-- SHORT MONTH FORMS -->
+    <term name="month-01" form="short">1</term>
+    <term name="month-02" form="short">2</term>
+    <term name="month-03" form="short">3</term>
+    <term name="month-04" form="short">4</term>
+    <term name="month-05" form="short">5</term>
+    <term name="month-06" form="short">6</term>
+    <term name="month-07" form="short">7</term>
+    <term name="month-08" form="short">8</term>
+    <term name="month-09" form="short">9</term>
+    <term name="month-10" form="short">10</term>
+    <term name="month-11" form="short">11</term>
+    <term name="month-12" form="short">12</term>
+  </locale>
+</terms>
--- a/chrome/locale/ko-KR/zotero/preferences.dtd
+++ b/chrome/locale/ko-KR/zotero/preferences.dtd
@ -0,0 +1,30 @@
+<!ENTITY zotero.preferences.title "Zotero 환경설정">
+
+<!ENTITY zotero.preferences.prefpane.general "General">
+<!ENTITY zotero.preferences.userInterface "User Interface">
+<!ENTITY zotero.preferences.position "Display Zotero">
+<!ENTITY zotero.preferences.position.above "위로">
+<!ENTITY zotero.preferences.position.below "아래로">
+<!ENTITY zotero.preferences.position.browser "브라우저 내용">
+<!ENTITY zotero.preferences.statusBarIcon "Status bar icon:">
+<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated scrapers">
+<!ENTITY zotero.preferences.updateNow "Update now">
+<!ENTITY zotero.preferences.reportTranslationFailure "Report broken site translators">
+<!ENTITY zotero.preferences.parseEndnote "Use Zotero for downloaded EndNote files">
+<!ENTITY zotero.preferences.automaticSnapshots "Automatically take snapshots when creating items from web pages">
+<!ENTITY zotero.preferences.downloadAssociatedFiles "Automatically attach associated PDFs and other files when saving items">
+<!ENTITY zotero.preferences.openurl.caption "OpenURL">
+<!ENTITY zotero.preferences.openurl.custom "Custom...">
+<!ENTITY zotero.preferences.openurl.server "Resolver:">
+<!ENTITY zotero.preferences.openurl.version "버전:">
+
+<!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
+<!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
+<!ENTITY zotero.preferences.keys.toggleFullscreen "Toggle Fullscreen Mode">
+<!ENTITY zotero.preferences.keys.library "Library">
+<!ENTITY zotero.preferences.keys.quicksearch "Quick Search">
+<!ENTITY zotero.preferences.keys.newItem "Create a new item">
+<!ENTITY zotero.preferences.keys.newNote "Create a new note">
+<!ENTITY zotero.preferences.keys.toggleTagSelector "Toggle Tag Selector">
+<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts">
+<!ENTITY zotero.preferences.keys.changesTakeEffect "Changes take effect in new windows only">
--- a/chrome/locale/ko-KR/zotero/searchbox.dtd
+++ b/chrome/locale/ko-KR/zotero/searchbox.dtd
@ -0,0 +1,17 @@
+<!ENTITY zotero.search.name "Name:">
+
+<!ENTITY zotero.search.joinMode.prefix "다음 조건 중">
+<!ENTITY zotero.search.joinMode.any "아무거나">
+<!ENTITY zotero.search.joinMode.all "모두">
+<!ENTITY zotero.search.joinMode.suffix "일치하는 것을 검색:">
+
+<!ENTITY zotero.search.recursive.label "하위폴더 검색">
+
+<!ENTITY zotero.search.textModes.phrase "어구">
+<!ENTITY zotero.search.textModes.phraseBinary "어구(바이너리 파일 포함)">
+<!ENTITY zotero.search.textModes.regexp "정규표현식">
+<!ENTITY zotero.search.textModes.regexpCS "정규표현식 (대/소문자 구분)">
+
+<!ENTITY zotero.search.date.units.days "days">
+<!ENTITY zotero.search.date.units.months "months">
+<!ENTITY zotero.search.date.units.years "years">
--- a/chrome/locale/ko-KR/zotero/zotero.dtd
+++ b/chrome/locale/ko-KR/zotero/zotero.dtd
@ -0,0 +1,90 @@
+<!ENTITY zotero.contextMenu.addTextToCurrentNote "Zotero 노트에 선택한 내용 추가">
+<!ENTITY zotero.contextMenu.addTextToNewNote "선택한 내용으로 Zotero 노트 생성">
+<!ENTITY zotero.contextMenu.saveLinkAsSnapshot "Save Link As Zotero Snapshot">
+<!ENTITY zotero.contextMenu.saveImageAsSnapshot "Save Image As Zotero Snapshot">
+
+<!ENTITY zotero.tabs.info.label "정보">
+<!ENTITY zotero.tabs.notes.label "노트">
+<!ENTITY zotero.tabs.attachments.label "첨부">
+<!ENTITY zotero.tabs.tags.label "태그">
+<!ENTITY zotero.tabs.related.label "관련 페이지">
+<!ENTITY zotero.notes.separate "분리 창으로 편집">
+
+<!ENTITY zotero.items.type_column "형식">
+<!ENTITY zotero.items.title_column "제목">
+<!ENTITY zotero.items.creator_column "창작자">
+<!ENTITY zotero.items.source_column "원본">
+<!ENTITY zotero.items.rights_column "권리">
+<!ENTITY zotero.items.numChildren_column "+">
+<!ENTITY zotero.items.dateAdded_column "날짜 추가">
+<!ENTITY zotero.items.dateModified_column "날짜 변경">
+
+<!ENTITY zotero.items.menu.showInLibrary "Show in Library">
+<!ENTITY zotero.items.menu.attach.note "노트 추가">
+<!ENTITY zotero.items.menu.attach.snapshot "현재 페이지의 스냅샷 첨부">
+<!ENTITY zotero.items.menu.attach.link "현재 페이지로 링크 첨부">
+
+<!ENTITY zotero.collections.name_column "수집품">
+
+<!ENTITY zotero.toolbar.newItem.label "새 항목">
+<!ENTITY zotero.toolbar.moreItemTypes.label "더 보기">
+<!ENTITY zotero.toolbar.newItemFromPage.label "현재 페이지로부터 새 항목 생성">
+<!ENTITY zotero.toolbar.removeItem.label "항목 삭제...">
+<!ENTITY zotero.toolbar.newCollection.label "새 수집품...">
+<!ENTITY zotero.toolbar.newSubcollection.label "New Subcollection...">
+<!ENTITY zotero.toolbar.newSavedSearch.label "새 저장된 검색...">
+<!ENTITY zotero.toolbar.tagSelector.label "Show/Hide Tag Selector">
+<!ENTITY zotero.toolbar.actions.label "동작">
+<!ENTITY zotero.toolbar.import.label "불러오기...">
+<!ENTITY zotero.toolbar.export.label "라이브러리 내보내기...">
+<!ENTITY zotero.toolbar.preferences.label "환경설정...">
+<!ENTITY zotero.toolbar.about.label "Zotero 정보...">
+<!ENTITY zotero.toolbar.search.label "검색:">
+<!ENTITY zotero.toolbar.fullscreen.tooltip "전체화면 모드 전환">
+<!ENTITY zotero.toolbar.goToURL.label "보기">
+<!ENTITY zotero.toolbar.goToURL.tooltip "이 항목의 온라인 주소로 가기">
+<!ENTITY zotero.toolbar.openURL.label "위치">
+<!ENTITY zotero.toolbar.openURL.tooltip "지역 라이브러리를 통해 검색">
+
+<!ENTITY zotero.item.add "추가">
+<!ENTITY zotero.item.attachment.file.show "파일 표시">
+
+<!ENTITY zotero.toolbar.note.standalone "새로운 독립 노트">
+<!ENTITY zotero.toolbar.attachment.linked "파일로 연결...">
+<!ENTITY zotero.toolbar.attachment.add "파일의 사본을 보존...">
+<!ENTITY zotero.toolbar.attachment.weblink "현재 페이지로 링크 저장">
+<!ENTITY zotero.toolbar.attachment.snapshot "현재 페이지의 스냅샷을 촬영">
+
+<!ENTITY zotero.tagSelector.noTagsToDisplay "No tags to display">
+<!ENTITY zotero.tagSelector.filter "Filter:">
+<!ENTITY zotero.tagSelector.displayAll "Display all tags">
+<!ENTITY zotero.tagSelector.selectVisible "Select visible">
+<!ENTITY zotero.tagSelector.clearVisible "Deselect visible">
+<!ENTITY zotero.tagSelector.clearAll "Deselect all">
+<!ENTITY zotero.tagSelector.renameTag "Rename Tag...">
+<!ENTITY zotero.tagSelector.deleteTag "Delete Tag...">
+
+<!ENTITY zotero.selectitems.title "항목 선택">
+<!ENTITY zotero.selectitems.intro.label "라이브러리에 추가하고 싶은 항목을 선택">
+<!ENTITY zotero.selectitems.cancel.label "취소">
+<!ENTITY zotero.selectitems.select.label "확인">
+
+<!ENTITY zotero.bibliography.title "참조 문헌 목록 생성">
+<!ENTITY zotero.bibliography.style.label "인용 형식:">
+<!ENTITY zotero.bibliography.output.label "출력 형식:">
+<!ENTITY zotero.bibliography.saveAsRTF.label "RTF로 저장">
+<!ENTITY zotero.bibliography.saveAsHTML.label "HTML로 저장">
+<!ENTITY zotero.bibliography.copyToClipboard.label "클립보드로 복사">
+<!ENTITY zotero.bibliography.print.label "인쇄">
+
+<!ENTITY zotero.integration.docPrefs.title "문서 환경설정">
+
+<!ENTITY zotero.progress.title "진행">
+
+<!ENTITY zotero.exportOptions.title "내보내기...">
+<!ENTITY zotero.exportOptions.format.label "형식:">
+<!ENTITY zotero.exportOptions.translatorOptions.label "번역자 선택사항">
+
+<!ENTITY zotero.citation.page "페이지">
+<!ENTITY zotero.citation.paragraph "단락">
+<!ENTITY zotero.citation.line "행">
--- a/chrome/locale/ko-KR/zotero/zotero.properties
+++ b/chrome/locale/ko-KR/zotero/zotero.properties
@ -0,0 +1,287 @@
+pane.collections.delete=선택된 수집품을 삭제하길 원하는게 맞습니까?
+pane.collections.deleteSearch=선택된 검색을 삭제하길 원하는게 맞습니까?
+pane.collections.name=수집품 명:
+pane.collections.rename=수집품 이름변경:
+pane.collections.library=내 라이브러리
+pane.collections.untitled=제목없음
+
+pane.collections.menu.rename.collection=Rename Collection...
+pane.collections.menu.edit.savedSearch=Edit Saved Search
+pane.collections.menu.remove.collection=Remove Collection...
+pane.collections.menu.remove.savedSearch=Remove Saved Search...
+pane.collections.menu.export.collection=Export Collection...
+pane.collections.menu.export.savedSearch=Export Saved Search...
+pane.collections.menu.createBib.collection=Create Bibliography From Collection...
+pane.collections.menu.createBib.savedSearch=Create Bibliography From Saved Search...
+
+pane.collections.menu.generateReport.collection=Generate Report from Collection...
+pane.collections.menu.generateReport.savedSearch=Generate Report from Saved Search...
+
+pane.tagSelector.rename.title=Please enter a new name for this tag.
+pane.tagSelector.rename.message=The tag will be changed in all associated items.
+pane.tagSelector.delete.title=Are you sure you want to delete this tag?
+pane.tagSelector.delete.message=The tag will be removed from all items.
+pane.tagSelector.numSelected.none=0 tags selected
+pane.tagSelector.numSelected.singular=%S tag selected
+pane.tagSelector.numSelected.plural=%S tags selected
+
+pane.items.delete=선택된 항목을 삭제하길 원하는게 맞습니까?
+pane.items.delete.multiple=선택된 수집품들을 삭제하길 원하는게 맞습니까?
+pane.items.delete.title=삭제
+pane.items.delete.attached=첨부된 노트와 파일 지우기
+pane.items.menu.remove=선택된 항목 삭제
+pane.items.menu.remove.multiple=선택된 항목 삭제
+pane.items.menu.erase=라이브러리로부터 선택된 항목 삭제...
+pane.items.menu.erase.multiple=라이브러리로부터 선택된 항목들 삭제...
+pane.items.menu.abstract.set=Set Note as Abstract
+pane.items.menu.abstract.unset=Unset Note as Abstract
+pane.items.menu.export=선택된 항목 내보내기...
+pane.items.menu.export.multiple=선택된 항목 내보내기...
+pane.items.menu.createBib=선택된 항목으로부터 참고 문헌 목록 생성...
+pane.items.menu.createBib.multiple=선택된 항목들로부터 참고 문헌 목록 생성...
+pane.items.menu.generateReport=Generate Report from Selected Item...
+pane.items.menu.generateReport.multiple=Generate Report from Selected Items...
+
+pane.item.selected.zero=선택된 항목이 없습니다
+pane.item.selected.multiple=%s개의 아이템이 선택되었습니다
+
+pane.item.changeType=항목의 형식을 변경하길 원하는게 맞습니까? 일부의 기입란이 분실될지도 모릅니다.
+pane.item.defaultFirstName=이름
+pane.item.defaultLastName=성
+pane.item.defaultFullName=전체 이름
+pane.item.notes.untitled=무제 노트
+pane.item.notes.delete.confirm=이 노트를 삭제하길 원하는게 맞습니까?
+pane.item.notes.count.zero=%S notes:
+pane.item.notes.count.singular=%s 노트
+pane.item.notes.count.plural=%s 노트
+pane.item.attachments.rename.title=New title:
+pane.item.attachments.rename.renameAssociatedFile=Rename associated file
+pane.item.attachments.rename.error=An error occurred while renaming the file.
+pane.item.attachments.view.link=페이지 보기
+pane.item.attachments.view.snapshot=스냅샷 보기
+pane.item.attachments.view.file=파일 보기
+pane.item.attachments.fileNotFound=첨부 파일을 찾을 수 없습니다.\n\n Zotero 밖으로 이동했거나 삭제되었을 가능성이 있습니다.
+pane.item.attachments.delete.confirm=이 첨부를 삭제하길 원하는게 맞습니까?
+pane.item.attachments.count.zero=%S attachments:
+pane.item.attachments.count.singular=%s 첨부
+pane.item.attachments.count.plural=%s 첨부
+pane.item.attachments.select=파일 선택
+pane.item.tags.count.zero=%S tags:
+pane.item.tags.count.singular=%s 태그
+pane.item.tags.count.plural=%s 태그
+pane.item.related.count.zero=%S related:
+pane.item.related.count.singular=%S related:
+pane.item.related.count.plural=%S related:
+
+itemTypes.note=노트
+itemTypes.attachment=첨부
+itemTypes.book=서적
+itemTypes.bookSection=서적 구역
+itemTypes.journalArticle=학술 논문
+itemTypes.magazineArticle=잡지 기사
+itemTypes.newspaperArticle=신문 기사
+itemTypes.thesis=논문
+itemTypes.letter=편지
+itemTypes.manuscript=원고
+itemTypes.interview=인터뷰
+itemTypes.film=영화
+itemTypes.artwork=예술품
+itemTypes.webpage=웹 페이지
+itemTypes.report=보고서
+itemTypes.bill=의안
+itemTypes.case=소송
+itemTypes.hearing=공청회
+itemTypes.patent=특허
+itemTypes.statute=법령
+itemTypes.email=이메일
+itemTypes.map=지도
+itemTypes.blogPost=블로그 포스트
+itemTypes.instantMessage=인스턴트 메시지
+itemTypes.forumPost=포럼 포스트
+itemTypes.audioRecording=녹음
+itemTypes.presentation=발표
+itemTypes.videoRecording=녹화
+itemTypes.tvBroadcast=TV 방송
+itemTypes.radioBroadcast=라디오 방송
+itemTypes.podcast=포드캐스트
+itemTypes.computerProgram=컴퓨터 풀그림
+itemTypes.conferencePaper=Conference Paper
+itemTypes.document=Document
+
+itemFields.itemType=Type
+itemFields.title=제목
+itemFields.dateAdded=날짜 추가
+itemFields.dateModified=날짜변경
+itemFields.source=원본
+itemFields.notes=노트
+itemFields.tags=Tags
+itemFields.attachments=Attachments
+itemFields.related=Related
+itemFields.url=URL
+itemFields.rights=권리
+itemFields.series=시리즈
+itemFields.volume=권
+itemFields.issue=발행
+itemFields.edition=판본
+itemFields.place=발행소
+itemFields.publisher=출판사
+itemFields.pages=쪽
+itemFields.ISBN=ISBN
+itemFields.publicationTitle=간행
+itemFields.ISSN=ISSN
+itemFields.date=날짜
+itemFields.section=구역
+itemFields.callNumber=도서 번호
+itemFields.archiveLocation=아카이브 번호
+itemFields.distributor=배급자
+itemFields.extra=추가사항
+itemFields.journalAbbreviation=학술 약어
+itemFields.DOI=DOI
+itemFields.accessDate=접근
+itemFields.seriesTitle=시리즈 제목
+itemFields.seriesText=시리즈 텍스트
+itemFields.seriesNumber=시리즈 번호
+itemFields.institution=학회
+itemFields.reportType=보고 형식
+itemFields.code=코드
+itemFields.session=세션
+itemFields.legislativeBody=입법 기관
+itemFields.history=역사
+itemFields.reporter=보고자
+itemFields.court=법원
+itemFields.numberOfVolumes=권수
+itemFields.committee=위원회
+itemFields.assignee=양수인
+itemFields.patentNumber=특허 번호
+itemFields.priorityNumbers=우선 번호
+itemFields.issueDate=발행일
+itemFields.references=참조
+itemFields.legalStatus=법적지위
+itemFields.codeNumber=코드 번호
+itemFields.artworkMedium=소재·기법
+itemFields.number=번호
+itemFields.artworkSize=예술품의 크기
+itemFields.repository=박물관
+itemFields.videoRecordingType=녹화 형식
+itemFields.interviewMedium=매체
+itemFields.letterType=형식
+itemFields.manuscriptType=형식
+itemFields.mapType=형식
+itemFields.scale=축척
+itemFields.thesisType=형식
+itemFields.websiteType=웹사이트 형식
+itemFields.audioRecordingType=녹음 형식
+itemFields.label=레이블
+itemFields.presentationType=형식
+itemFields.meetingName=회의명
+itemFields.studio=스튜디오
+itemFields.runningTime=동작 시간
+itemFields.network=네트워크
+itemFields.postType=포스트 종류
+itemFields.audioFileType=파일 형식
+itemFields.version=버전
+itemFields.system=체계
+itemFields.company=회사명
+itemFields.conferenceName=Conference Name
+
+creatorTypes.author=저자
+creatorTypes.contributor=공헌자
+creatorTypes.editor=편집자
+creatorTypes.translator=번역자
+creatorTypes.seriesEditor=시리즈 편집자
+creatorTypes.interviewee=인터뷰：
+creatorTypes.interviewer=인터뷰어
+creatorTypes.director=감독
+creatorTypes.scriptwriter=각본가
+creatorTypes.producer=제작자
+creatorTypes.castMember=출연 단원
+creatorTypes.sponsor=후원자
+creatorTypes.counsel=회의
+creatorTypes.inventor=발명자
+creatorTypes.attorneyAgent=변호사/대리인
+creatorTypes.recipient=수령인
+creatorTypes.performer=연주자
+creatorTypes.composer=작곡가
+creatorTypes.wordsBy=작사
+creatorTypes.cartographer=지도 제작자
+creatorTypes.programmer=프로그래머
+creatorTypes.reviewedAuthor=평론가
+creatorTypes.artist=예술가
+creatorTypes.commenter=비평가
+creatorTypes.presenter=제출자
+creatorTypes.guest=손님
+creatorTypes.podcaster=포드 캐스터
+
+ingester.scraping=항목 저장...
+ingester.scrapeComplete=항목 저장됨.
+ingester.scrapeError=항목을 저장할 수 없습니다.
+ingester.scrapeErrorDescription=항목 저장중 오류가 발생했습니다. 다시 시도해 주세요. 오류가 지족적으로 발생하는 경우, 작성자에게 연락해 주십시오.
+
+db.dbCorruptedNoBackup=Zotero의 데이타베이스가 훼손되어 있는 것으로 보이며, 자동 백업본이 존재하지 않습니다. \n\n신규 데이타베이스·파일이 생성되었습니다. 파손된 파일을 Zotero 폴더에 저장했습니다.
+db.dbRestored=Zotero의 데이타베이스가 훼손되어 있는 것으로 보입니다. \n\n데이터는 최종 자동 백업(%1$S %2$S)으로부터 복원되었습니다. 파손된 파일을 Zotero 폴더에 저장했습니다.
+db.dbRestoreFailed=Zotero의 데이타베이스가 훼손되어 있는 것으로 보이며, 최종 자동 백업으로부터 복원에 실패했습니다. \n\n신규 데이타베이스 파일이 생성되었습니다. 파손된 파일을 Zotero 폴더에 저장했습니다.
+
+zotero.preferences.update.updated=Updated
+zotero.preferences.update.upToDate=Up to date
+zotero.preferences.update.error=Error
+zotero.preferences.openurl.resolversFound.zero=%S resolvers found
+zotero.preferences.openurl.resolversFound.singular=%S resolver found
+zotero.preferences.openurl.resolversFound.plural=%S resolvers found
+
+fileInterface.itemsImported=항목 불러오는 중..
+fileInterface.itemsExported=항목 내보내는 중...
+fileInterface.import=불러오기
+fileInterface.export=내보내기
+fileInterface.exportedItems=내보낸 항목
+fileInterface.imported=불러들인
+fileInterface.fileFormatUnsupported=주어진 파일의 번역을 찾을 수 없습니다.
+fileInterface.untitledBibliography=제목없는 참고 문헌 목록
+fileInterface.bibliographyHTMLTitle=참고 문헌 목록
+fileInterface.importError=선택한 파일을 불러오는 중에 오류가 발생했습니다. 파일이 유효한지를 확인 후 다시 시도해 주십시오.
+fileInterface.noReferencesError=선택된 아이템은 참조를 포함하지 않습니다. 참조를 1개이상 선택해, 다시 시도하십시오.
+fileInterface.bibliographyGenerationError=참고 문헌 목록을 작성중 오류가 발생했습니다. 다시 시도해 주세요.
+fileInterface.exportError=선택된 파일의 내보내던 중 오류가 발생했습니다.
+
+advancedSearchMode=Advanced search mode — press Enter to search.
+searchInProgress=Search in progress — press wait.
+
+searchOperator.is=＝
+searchOperator.isNot=≠
+searchOperator.contains=포함하는
+searchOperator.doesNotContain=포함하지 않은
+searchOperator.isLessThan=이 다음보다 적다：
+searchOperator.isGreaterThan=이 다음보다 크다：
+searchOperator.isBefore=다음보다 이전에
+searchOperator.isAfter=다음보다 이후에
+searchOperator.isInTheLast=is in the last
+
+searchConditions.collectionID=수집품
+searchConditions.itemTypeID=항목 형식
+searchConditions.tag=태그
+searchConditions.note=노트
+searchConditions.creator=창작가
+searchConditions.thesisType=논문 형식
+searchConditions.reportType=보고서 형식
+searchConditions.videoRecordingType=녹화 형식
+searchConditions.audioRecordingType=녹음 형식
+searchConditions.letterType=편지 형식
+searchConditions.interviewMedium=회견 매체
+searchConditions.manuscriptType=원고 형식
+searchConditions.presentationType=발표 형식
+searchConditions.mapType=지도 형식
+searchConditions.dateModified=날짜 변경
+searchConditions.fulltextContent=목차 첨부
+
+
+exportOptions.exportNotes=노트 내보내기
+exportOptions.exportFileData=파일 내보내기
+
+date.daySuffixes=일, 일, 일, 일
+date.abbreviation.year=y
+date.abbreviation.month=m
+date.abbreviation.day=d
+
+citation.multipleSources=복수의 출처...
+citation.singleSource=단일 출처...
+
+report.title.default=Zotero Report
--- a/chrome/locale/nb-NO/zotero/preferences.dtd
+++ b/chrome/locale/nb-NO/zotero/preferences.dtd
@ -13,7 +13,7 @@
 <!ENTITY zotero.preferences.parseEndnote "Use Zotero for downloaded EndNote files">
 <!ENTITY zotero.preferences.automaticSnapshots "Automatically take snapshots when creating items from web pages">
 <!ENTITY zotero.preferences.downloadAssociatedFiles "Automatically attach associated PDFs and other files when saving items">
-<!ENTITY zotero.preferences.openurl.caption "Åpne URL">
+<!ENTITY zotero.preferences.openurl.caption "Åpne URL">
 <!ENTITY zotero.preferences.openurl.custom "Custom...">
 <!ENTITY zotero.preferences.openurl.server "Resolver:">
 <!ENTITY zotero.preferences.openurl.version "Versjon:">
--- a/chrome/locale/nb-NO/zotero/searchbox.dtd
+++ b/chrome/locale/nb-NO/zotero/searchbox.dtd
@ -3,12 +3,12 @@
 <!ENTITY zotero.search.joinMode.prefix "Finn">
 <!ENTITY zotero.search.joinMode.any "hvilken som helst">
 <!ENTITY zotero.search.joinMode.all "alle">
-<!ENTITY zotero.search.joinMode.suffix "av følgende:">
+<!ENTITY zotero.search.joinMode.suffix "av følgende:">

-<!ENTITY zotero.search.recursive.label "Søk i undermapper">
+<!ENTITY zotero.search.recursive.label "Søk i undermapper">

 <!ENTITY zotero.search.textModes.phrase "Frase">
-<!ENTITY zotero.search.textModes.phraseBinary "Frase (inkl. binærfiler)">
+<!ENTITY zotero.search.textModes.phraseBinary "Frase (inkl. binærfiler)">
 <!ENTITY zotero.search.textModes.regexp "Regexp">
 <!ENTITY zotero.search.textModes.regexpCS "Regexp (versalsensitiv)">

--- a/chrome/locale/nb-NO/zotero/zotero.dtd
+++ b/chrome/locale/nb-NO/zotero/zotero.dtd
@ -32,24 +32,24 @@
 <!ENTITY zotero.toolbar.removeItem.label "Slett element...">
 <!ENTITY zotero.toolbar.newCollection.label "Ny samling...">
 <!ENTITY zotero.toolbar.newSubcollection.label "New Subcollection...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nytt lagret søk...">
+<!ENTITY zotero.toolbar.newSavedSearch.label "Nytt lagret søk...">
 <!ENTITY zotero.toolbar.tagSelector.label "Show/Hide Tag Selector">
 <!ENTITY zotero.toolbar.actions.label "Handlinger">
 <!ENTITY zotero.toolbar.import.label "Importer...">
 <!ENTITY zotero.toolbar.export.label "Eksporter bibliotek...">
 <!ENTITY zotero.toolbar.preferences.label "Innstillinger...">
 <!ENTITY zotero.toolbar.about.label "Om Zotero...">
-<!ENTITY zotero.toolbar.search.label "Søk:">
+<!ENTITY zotero.toolbar.search.label "Søk:">
 <!ENTITY zotero.toolbar.fullscreen.tooltip "Velg fullskjermmodus">
 <!ENTITY zotero.toolbar.goToURL.label "Se">
-<!ENTITY zotero.toolbar.goToURL.tooltip "Gå til dette elementet online">
+<!ENTITY zotero.toolbar.goToURL.tooltip "Gå til dette elementet online">
 <!ENTITY zotero.toolbar.openURL.label "Lokaliser">
 <!ENTITY zotero.toolbar.openURL.tooltip "Finn gjennom ditt lokale bibliotek">

 <!ENTITY zotero.item.add "Legg til">
 <!ENTITY zotero.item.attachment.file.show "Vis fil">

-<!ENTITY zotero.toolbar.note.standalone "Nytt enkeltstående notat">
+<!ENTITY zotero.toolbar.note.standalone "Nytt enkeltstående notat">
 <!ENTITY zotero.toolbar.attachment.linked "Lenke til fil...">
 <!ENTITY zotero.toolbar.attachment.add "Lagre kopi av fil...">
 <!ENTITY zotero.toolbar.attachment.weblink "Lagre lenke til gjeldende side">
--- a/chrome/locale/nb-NO/zotero/zotero.properties
+++ b/chrome/locale/nb-NO/zotero/zotero.properties
@ -1,5 +1,5 @@
-pane.collections.delete=Er du sikker på at du vil slette den valgte samlingen?
-pane.collections.deleteSearch=Er du sikker på at du vil slette det valgte søket?
+pane.collections.delete=Er du sikker på at du vil slette den valgte samlingen?
+pane.collections.deleteSearch=Er du sikker på at du vil slette det valgte søket?
 pane.collections.name=Samlingsnavn:
 pane.collections.rename=Gi samling nytt navn:
 pane.collections.library=Mitt bibliotek
@ -25,8 +25,8 @@ pane.tagSelector.numSelected.none=0 tags selected
 pane.tagSelector.numSelected.singular=%S tag selected
 pane.tagSelector.numSelected.plural=%S tags selected

-pane.items.delete=Er du sikker på at du vil slette det valgte elementet?
-pane.items.delete.multiple=Er du sikker på at du vil slette de valgte elementene?
+pane.items.delete=Er du sikker på at du vil slette det valgte elementet?
+pane.items.delete.multiple=Er du sikker på at du vil slette de valgte elementene?
 pane.items.delete.title=Slett
 pane.items.delete.attached=Slett vedlagte notater og filer
 pane.items.menu.remove=Slett valgt element
@ -45,12 +45,12 @@ pane.items.menu.generateReport.multiple=Generate Report from Selected Items...
 pane.item.selected.zero=Ingen elementer er valgt
 pane.item.selected.multiple=%S elementer er valgt

-pane.item.changeType=Er du sikker på at du vil endre elementtypen? Enkelte felter kan gå tapt.
-pane.item.defaultFirstName=først
+pane.item.changeType=Er du sikker på at du vil endre elementtypen? Enkelte felter kan gå tapt.
+pane.item.defaultFirstName=først
 pane.item.defaultLastName=sist
 pane.item.defaultFullName=fullt navn
 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.delete.confirm=Er du sikker på at du vil slette dette notatet?
 pane.item.notes.count.zero=%S notes:
 pane.item.notes.count.singular=%S notat
 pane.item.notes.count.plural=%S notater
@ -61,7 +61,7 @@ pane.item.attachments.view.link=Vis side
 pane.item.attachments.view.snapshot=Vis snapshot
 pane.item.attachments.view.file=Vis fil
 pane.item.attachments.fileNotFound=Den vedlagte filen ble ikke funnet.\n\nDen kan ha blitt flyttet eller slettet utenfor Zotero.
-pane.item.attachments.delete.confirm=Er du sikker på at du vil slette dette vedlegget?
+pane.item.attachments.delete.confirm=Er du sikker på at du vil slette dette vedlegget?
 pane.item.attachments.count.zero=%S attachments:
 pane.item.attachments.count.singular=%S vedlegg
 pane.item.attachments.count.plural=%S vedlegg
@ -90,7 +90,7 @@ itemTypes.webpage=Nettside
 itemTypes.report=Rapport
 itemTypes.bill=Lovforslag
 itemTypes.case=Sak
-itemTypes.hearing=Høring
+itemTypes.hearing=Høring
 itemTypes.patent=Patent
 itemTypes.statute=Statutt
 itemTypes.email=E-post
@ -133,7 +133,7 @@ itemFields.date=Dato
 itemFields.section=Seksjon
 itemFields.callNumber=Plassignatur
 itemFields.archiveLocation=Lokalisering i arkiv
-itemFields.distributor=Distributør
+itemFields.distributor=Distributør
 itemFields.extra=Ekstra
 itemFields.journalAbbreviation=Tidsskriftforkortelse
 itemFields.DOI=DOI
@ -160,7 +160,7 @@ itemFields.legalStatus=Legal status
 itemFields.codeNumber=Kode nummer
 itemFields.artworkMedium=Kunstverk medium
 itemFields.number=Nummer
-itemFields.artworkSize=Kunstverk størrelse
+itemFields.artworkSize=Kunstverk størrelse
 itemFields.repository=Oppbevaringssted
 itemFields.videoRecordingType=Opptakstype
 itemFields.interviewMedium=Medium
@ -173,7 +173,7 @@ itemFields.websiteType=Nettstedtype
 itemFields.audioRecordingType=Opptakstype
 itemFields.label=Plateselskap
 itemFields.presentationType=Type
-itemFields.meetingName=Møtenavn
+itemFields.meetingName=Møtenavn
 itemFields.studio=Studio
 itemFields.runningTime=Lengde
 itemFields.network=Nettverk
@ -186,21 +186,21 @@ itemFields.conferenceName=Conference Name

 creatorTypes.author=Forfatter
 creatorTypes.contributor=Medforfatter
-creatorTypes.editor=Redaktør
+creatorTypes.editor=Redaktør
 creatorTypes.translator=Oversetter
-creatorTypes.seriesEditor=Serieredaktør
+creatorTypes.seriesEditor=Serieredaktør
 creatorTypes.interviewee=Intervju med
 creatorTypes.interviewer=Intervjuer
-creatorTypes.director=Instruktør
+creatorTypes.director=Instruktør
 creatorTypes.scriptwriter=Manusforfatter
 creatorTypes.producer=Produsent
 creatorTypes.castMember=Skuespiller
 creatorTypes.sponsor=Sponsor
-creatorTypes.counsel=Rådgiver
+creatorTypes.counsel=Rådgiver
 creatorTypes.inventor=Oppfinner
 creatorTypes.attorneyAgent=Advokat/Agent
 creatorTypes.recipient=Mottaker
-creatorTypes.performer=Utøver
+creatorTypes.performer=Utøver
 creatorTypes.composer=Komponist
 creatorTypes.wordsBy=Tekster av
 creatorTypes.cartographer=Kartograf
@ -215,11 +215,11 @@ creatorTypes.podcaster=Podcaster
 ingester.scraping=Lagrer element...
 ingester.scrapeComplete=Element lagret.
 ingester.scrapeError=Kunne ikke lagre element.
-ingester.scrapeErrorDescription=En feil oppsto mens dette elementet ble forsøkt lagret. Vennligst prøv igjen. Vennligst kontakt forfatteren av oversetteren dersom denne feilen vedvarer.
+ingester.scrapeErrorDescription=En feil oppsto mens dette elementet ble forsøkt lagret. Vennligst prøv igjen. Vennligst kontakt forfatteren av oversetteren dersom denne feilen vedvarer.

-db.dbCorruptedNoBackup=Zotero-databasen synes å ha blitt korrupt, og ingen automatisk backup er tilgjengelig.\n\nEn ny database har blitt skapt. Den skadde filen ble lagret i Zotero-mappen.
-db.dbRestored=Zotero-databasen synes å ha blitt korrupt.\n\nDataene dine ble gjenopprettet fra den siste automatiske backupfilen, skapt %1$S den %2$S. Den skadde filen ble lagret i Zotero-mappen.
-db.dbRestoreFailed=Zotero-databasen synes å ha blitt korrupt, og et forsøk på å gjenopprette fra sist backup feilet.\n\nEn ny database har blitt skapt. Den skadde filen ble lagret i Zotero-mappen.
+db.dbCorruptedNoBackup=Zotero-databasen synes å ha blitt korrupt, og ingen automatisk backup er tilgjengelig.\n\nEn ny database har blitt skapt. Den skadde filen ble lagret i Zotero-mappen.
+db.dbRestored=Zotero-databasen synes å ha blitt korrupt.\n\nDataene dine ble gjenopprettet fra den siste automatiske backupfilen, skapt %1$S den %2$S. Den skadde filen ble lagret i Zotero-mappen.
+db.dbRestoreFailed=Zotero-databasen synes å ha blitt korrupt, og et forsøk på å gjenopprette fra sist backup feilet.\n\nEn ny database har blitt skapt. Den skadde filen ble lagret i Zotero-mappen.

 zotero.preferences.update.updated=Updated
 zotero.preferences.update.upToDate=Up to date
@ -237,21 +237,21 @@ fileInterface.imported=Importert
 fileInterface.fileFormatUnsupported=Ingen oversetter kunne finnes for den gjeldende filen.
 fileInterface.untitledBibliography=Bibliografi uten tittel
 fileInterface.bibliographyHTMLTitle=Bibliografi
-fileInterface.importError=En feil oppsto under importeringen av den valgte filen. Vennligst forsikre deg om at filen er gyldig før du prøver igjen.
-fileInterface.noReferencesError=Elementene du valgte inneholder ingen referanser. Vennligst velg en eller flere referanser og prøv igjen.
-fileInterface.bibliographyGenerationError=En feil oppsto under genereringen av bibliografien. Vennligst prøv igjen.
+fileInterface.importError=En feil oppsto under importeringen av den valgte filen. Vennligst forsikre deg om at filen er gyldig før du prøver igjen.
+fileInterface.noReferencesError=Elementene du valgte inneholder ingen referanser. Vennligst velg en eller flere referanser og prøv igjen.
+fileInterface.bibliographyGenerationError=En feil oppsto under genereringen av bibliografien. Vennligst prøv igjen.
 fileInterface.exportError=En feil oppsto under eksporteringen av den valgte filen.

-advancedSearchMode=Advanced search mode â€” press Enter to search.
-searchInProgress=Search in progress â€” press wait.
+advancedSearchMode=Advanced search mode â press Enter to search.
+searchInProgress=Search in progress â press wait.

 searchOperator.is=er
 searchOperator.isNot=er ikke
 searchOperator.contains=inneholder
 searchOperator.doesNotContain=inneholder ikke
 searchOperator.isLessThan=er mindre enn
-searchOperator.isGreaterThan=er større enn
-searchOperator.isBefore=er før
+searchOperator.isGreaterThan=er større enn
+searchOperator.isBefore=er før
 searchOperator.isAfter=er etter
 searchOperator.isInTheLast=is in the last

--- a/chrome/skin/default/zotero/bindings/tagselector.css
+++ b/chrome/skin/default/zotero/bindings/tagselector.css
@ -1,7 +1,8 @@
 groupbox
 {
-	overflow: auto;
-	min-height: 130px;
+	overflow: hidden;
+	min-height: 132px;
+	padding-bottom: 2px;
 }

 #tags-toggle
@ -52,12 +53,21 @@ groupbox > hbox
 	-moz-box-pack: center;
 }

+textbox
+{
+	margin: 3px 0 2px;
+	font-size: 11px !important; /* Keep font size in Linux within reason */
+}
+
 #search-cancel
 {
-	margin: 0px;
-	padding: 0px;
+	width: 0;
+	height: 0;
+	margin: 0;
+	padding: 0;
 	cursor: default;
 	list-style-image: url('chrome://zotero/skin/search-cancel.png');
+	-moz-appearance: none !important; /* Fix rendering problems on Linux */
 }

 groupbox > hbox > hbox
@ -73,8 +83,3 @@ toolbarbutton.zotero-clicky
 	padding:1px;
 	height:1em;
 }
-
-textbox
-{
-	margin: 3px 0 1px;
-}
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@ -1,14 +1,15 @@
 #zotero-status-bar-icon
 {
-	width: 47px;
-	margin:0 0 -1px;
-	padding:0 4px 1px;
+	width: 55px;
+	margin: 0 0 -1px; /* For Fitts's law (on OS X, at least) */
+	padding: 0 0 1px;
 	list-style-image: url(chrome://zotero/skin/zotero_status_bar.png);
 }
 #zotero-status-bar-icon[compact="true"]
 {
-	width: 9px;
-	padding:0 5px 1px;
+	width: 20px;
+	margin: 0 0 -1px;
+	padding: 0 0 1px;
 	list-style-image: url(chrome://zotero/skin/zotero_status_bar_compact.png);
 }
 #zotero-status-bar-icon[error="true"]
@ -28,7 +29,7 @@
 #zotero-collections-pane
 {
 	min-width: 150px;
-	width: 150px;
+	width: 250px;
 }

 #zotero-collections-tree {
@ -95,7 +96,17 @@
 	list-style-image: url(chrome://zotero/skin/tag-selector.png);
 }

+/* Hard-code this to fix toolbar icon compression on Linux */
+#zotero-pane toolbar
+{
+	height: 32px !important;
+}

+/* Remove extra padding on Linux */
+#zotero-pane {
+	padding-top: 0;
+	padding-bottom: 0;
+}

 /* These fix a rendering bug in Fx2.0b2 */
 #zotero-pane toolbarbutton .toolbarbutton-text
@ -180,6 +191,7 @@

 #zotero-tb-search
 {
+	font-size: 11px !important; /* Keep font size in Linux within reason */
 	width: 150px;
 }

@ -190,10 +202,13 @@

 #zotero-tb-search-cancel
 {
-	margin: 0px;
-	padding: 0px;
+	width: 10px;
+	height: 10px;
+	margin: 0;
+	padding: 0;
 	cursor: default;
 	list-style-image: url('chrome://zotero/skin/search-cancel.png');
+	-moz-appearance: none !important; /* Fix rendering problems on Linux */
 }

 #zotero-tb-search-cancel:hover:active
--- a/scrapers.sql
+++ b/scrapers.sql
@ -1,4 +1,4 @@
-- 157
+-- 162

 --  ***** BEGIN LICENSE BLOCK *****
 --  
@ -22,7 +22,7 @@


 -- Set the following timestamp to the most recent scraper update date
-REPLACE INTO "version" VALUES ('repository', STRFTIME('%s', '2006-12-21 18:29:08'));
+REPLACE INTO "version" VALUES ('repository', STRFTIME('%s', '2007-01-08 04:10:00'));

 REPLACE INTO translators VALUES ('96b9f483-c44d-5784-cdad-ce21b984fe01', '1.0.0b3.r1', '', '2006-12-15 03:40:00', 1, 100, 4, 'Amazon.com', 'Sean Takats', '^https?://(?:www\.)?amazon', 
 'function detectWeb(doc, url) {
@ -411,7 +411,7 @@ function doWeb(doc, url) {
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('88915634-1af6-c134-0171-56fd198235ed', '1.0.0b2.r2', '', '2006-12-15 15:11:00', 1, 100, 4, 'Library Catalog (Voyager)', 'Simon Kornblith', 'Pwebrecon\.cgi',
+REPLACE INTO translators VALUES ('88915634-1af6-c134-0171-56fd198235ed', '1.0.0b3.r1', '', '2006-12-15 15:11:00', 1, 100, 4, 'Library Catalog (Voyager)', 'Simon Kornblith', 'Pwebrecon\.cgi',
 'function detectWeb(doc, url) {
 	var export_options = doc.forms.namedItem(''frm'').elements.namedItem(''RD'').options;
 	for(var i in export_options) {
@ -780,7 +780,7 @@ function doWeb(doc, url) {
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('e85a3134-8c1a-8644-6926-584c8565f23e', '1.0.0b2.r2', '', '2006-12-14 00:40:00', 1, 100, 4, 'History Cooperative', 'Simon Kornblith', '^http://www\.historycooperative\.org/(?:journals/.+/.+/.+\.s?html$|cgi-bin/search.cgi)', 
+REPLACE INTO translators VALUES ('e85a3134-8c1a-8644-6926-584c8565f23e', '1.0.0b3.r1', '', '2006-12-14 00:40:00', 1, 100, 4, 'History Cooperative', 'Simon Kornblith', '^http://www\.historycooperative\.org/(?:journals/.+/.+/.+\.s?html$|cgi-bin/search.cgi)', 
 'function detectWeb(doc, url) {
 	if(doc.title == "History Cooperative: Search Results") {
 		return "multiple";
@ -1919,7 +1919,7 @@ function doWeb(doc, url) {
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('b047a13c-fe5c-6604-c997-bef15e502b09', '1.0.0b2.r2', '', '2006-12-14 00:40:00', 1, 100, 4, 'LexisNexis', 'Simon Kornblith', '^http://web\.lexis-?nexis\.com/universe/(?:document|doclist)',
+REPLACE INTO translators VALUES ('b047a13c-fe5c-6604-c997-bef15e502b09', '1.0.0b3.r1', '', '2006-12-14 00:40:00', 1, 100, 4, 'LexisNexis', 'Simon Kornblith', '^http://web\.lexis-?nexis\.com/universe/(?:document|doclist)',
 'function detectWeb(doc, url) {
 	var detailRe = new RegExp("^https?://[^/]+/universe/document");
 	if(detailRe.test(doc.location.href)) {
@ -2022,7 +2022,7 @@ function doWeb(doc, url) {
 	}
 }');

-REPLACE INTO translators VALUES ('cf87eca8-041d-b954-795a-2d86348999d5', '1.0.0b2.r2', '', '2006-12-15 15:11:00', 1, 100, 4, 'Library Catalog (Aleph)', 'Simon Kornblith', '^https?://[^/]+/F(?:/[A-Z0-9\-]+(?:\?.*)?$|\?func=find|\?func=scan)',
+REPLACE INTO translators VALUES ('cf87eca8-041d-b954-795a-2d86348999d5', '1.0.0b3.r1', '', '2006-12-15 15:11:00', 1, 100, 4, 'Library Catalog (Aleph)', 'Simon Kornblith', '^https?://[^/]+/F(?:/[A-Z0-9\-]+(?:\?.*)?$|\?func=find|\?func=scan)',
 'function detectWeb(doc, url) {
 	var singleRe = new RegExp("^https?://[^/]+/F/[A-Z0-9\-]+\?.*(?:func=full-set-set.*\&format=[0-9]{3}|func=direct)");
 	
@ -2125,7 +2125,7 @@ REPLACE INTO translators VALUES ('cf87eca8-041d-b954-795a-2d86348999d5', '1.0.0b
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('774d7dc2-3474-2684-392c-f787789ec63d', '1.0.0b2.r2', '', '2006-12-15 15:11:00', 1, 100, 4, 'Library Catalog (Dynix)', 'Simon Kornblith', 'ipac\.jsp\?.*(?:uri=full=[0-9]|menu=search)',
+REPLACE INTO translators VALUES ('774d7dc2-3474-2684-392c-f787789ec63d', '1.0.0b3.r1', '', '2006-12-15 15:11:00', 1, 100, 4, 'Library Catalog (Dynix)', 'Simon Kornblith', 'ipac\.jsp\?.*(?:uri=full=[0-9]|menu=search)',
 'function detectWeb(doc, url) {
 	var detailsRe = new RegExp(''ipac\.jsp\?.*uri=full=[0-9]'');
 	if(detailsRe.test(doc.location.href)) {
@ -2336,7 +2336,7 @@ REPLACE INTO translators VALUES ('63a0a351-3131-18f4-21aa-f46b9ac51d87', '1.0.0b
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('fb12ae9e-f473-cab4-0546-27ab88c64101', '1.0.0b2.r2', '', '2006-12-15 15:11:00', 1, 100, 4, 'Library Catalog (DRA)', 'Simon Kornblith', '/web2/tramp2\.exe/(?:see\_record/|authority\_hits/|goto/.*\?.*screen=Record\.html)',
+REPLACE INTO translators VALUES ('fb12ae9e-f473-cab4-0546-27ab88c64101', '1.0.0b3.r1', '', '2006-12-15 15:11:00', 1, 100, 4, 'Library Catalog (DRA)', 'Simon Kornblith', '/web2/tramp2\.exe/(?:see\_record/|authority\_hits/|goto/.*\?.*screen=Record\.html)',
 'function detectWeb(doc, url) {
 	if(doc.location.href.indexOf("/authority_hits") > 0) {
 		return "multiple";
@ -2407,7 +2407,7 @@ REPLACE INTO translators VALUES ('fb12ae9e-f473-cab4-0546-27ab88c64101', '1.0.0b
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('c0e6fda6-0ecd-e4f4-39ca-37a4de436e15', '1.0.0b2.r2', '', '2006-12-15 15:11:00', 1, 100, 4, 'Library Catalog (GEAC)', 'Simon Kornblith', '/(?:GeacQUERY|GeacFETCH[\:\?].*[&:]next=html/(?:record\.html|geacnffull\.html))',
+REPLACE INTO translators VALUES ('c0e6fda6-0ecd-e4f4-39ca-37a4de436e15', '1.0.0b3.r1', '', '2006-12-15 15:11:00', 1, 100, 4, 'Library Catalog (GEAC)', 'Simon Kornblith', '/(?:GeacQUERY|GeacFETCH[\:\?].*[&:]next=html/(?:record\.html|geacnffull\.html))',
 'function detectWeb(doc, url) {
 	if(doc.location.href.indexOf("/GeacQUERY") > 0) {
 		return "multiple";
@ -2500,7 +2500,7 @@ REPLACE INTO translators VALUES ('c0e6fda6-0ecd-e4f4-39ca-37a4de436e15', '1.0.0b
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('0f9fc2fc-306e-5204-1117-25bca009dffc', '1.0.0b2.r2', '', '2006-12-15 15:11:00', 1, 100, 4, 'Library Catalog (TLC/YouSeeMore)', 'Simon Kornblith', 'TLCScripts/interpac\.dll\?(?:.*LabelDisplay.*RecordNumber=[0-9]|Search|ItemTitles)',
+REPLACE INTO translators VALUES ('0f9fc2fc-306e-5204-1117-25bca009dffc', '1.0.0b3.r1', '', '2006-12-15 15:11:00', 1, 100, 4, 'Library Catalog (TLC/YouSeeMore)', 'Simon Kornblith', 'TLCScripts/interpac\.dll\?(?:.*LabelDisplay.*RecordNumber=[0-9]|Search|ItemTitles)',
 'function detectWeb(doc, url) {
 	var detailRe = new RegExp("TLCScripts/interpac\.dll\?.*LabelDisplay.*RecordNumber=[0-9]");
 	if(detailRe.test(doc.location.href)) {
@ -3151,7 +3151,7 @@ function doWeb(doc, url) {
 	}
 }');

-REPLACE INTO translators VALUES ('3e684d82-73a3-9a34-095f-19b112d88bbf', '1.0.0b3.r1', '', '2006-12-15 03:40:00', 1, 100, 4, 'Google Books', 'Simon Kornblith', '^http://books\.google\.[a-z]+/books\?(.*vid=.*\&id=.*|.*q=.*)',
+REPLACE INTO translators VALUES ('3e684d82-73a3-9a34-095f-19b112d88bbf', '1.0.0b3.r1', '', '2007-01-07 17:00:00', 1, 100, 4, 'Google Books', 'Simon Kornblith', '^http://books\.google\.[a-z]+/books\?(.*vid=.*\&id=.*|.*q=.*)',
 'function detectWeb(doc, url) {
 	var re = new RegExp(''^http://books\\.google\\.[a-z]+/books\\?vid=([^&]+).*\\&id=([^&]+)'', ''i'');
 	if(re.test(doc.location.href)) {
@ -3164,7 +3164,7 @@ REPLACE INTO translators VALUES ('3e684d82-73a3-9a34-095f-19b112d88bbf', '1.0.0b
 	var uri = doc.location.href;
 	var newUris = new Array();
 	
-	var re = new RegExp(''^http://books\\.google\\.([a-z]+)/books\\?vid=([^&]+).*\\&id=([^&]+)'', ''i'');
+	var re = new RegExp(''^http://books\\.google\\.[a-z]+/books\\?vid=([^&]+).*\\&id=([^&]+)'', ''i'');
 	var m = re.exec(uri);
 	if(m) {
 		newUris.push(''http://books.google.com/books?vid=''+m[1]+''&id=''+m[2]);
@ -3341,7 +3341,7 @@ REPLACE INTO translators VALUES ('57a00950-f0d1-4b41-b6ba-44ff0fc30289', '1.0.0b
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('9c335444-a562-4f88-b291-607e8f46a9bb', '1.0.0b2.r2', '', '2006-12-15 15:11:00', 1, 100, 4, 'Berkeley Library Catalog', 'Simon Kornblith', '^http://[^/]*berkeley.edu[^/]*/WebZ/(?:html/results.html|FETCH)\?.*sessionid=',
+REPLACE INTO translators VALUES ('9c335444-a562-4f88-b291-607e8f46a9bb', '1.0.0b3.r1', '', '2006-12-15 15:11:00', 1, 100, 4, 'Berkeley Library Catalog', 'Simon Kornblith', '^http://[^/]*berkeley.edu[^/]*/WebZ/(?:html/results.html|FETCH)\?.*sessionid=',
 'function detectWeb(doc, url) {
 	var resultsRegexp = /\/WebZ\/html\/results.html/i
 	if(resultsRegexp.test(url)) {
@ -3722,7 +3722,7 @@ function doWeb(doc, url) {
 	}
 }');

-REPLACE INTO translators VALUES ('1e6d1529-246f-4429-84e2-1f1b180b250d', '1.0.0b2.r2', '', '2006-12-12 23:41:00', 1, 100, 4, 'The Chronicle of Higher Education', 'Simon Kornblith', '^http://chronicle\.com/', 
+REPLACE INTO translators VALUES ('1e6d1529-246f-4429-84e2-1f1b180b250d', '1.0.0b3.r1', '', '2006-12-12 23:41:00', 1, 100, 4, 'The Chronicle of Higher Education', 'Simon Kornblith', '^http://chronicle\.com/', 
 'function detectWeb(doc, url) {
 	var articleRegexp = /^http:\/\/chronicle\.com\/(?:daily|weekly)\/[^/]+\//
 	if(articleRegexp.test(url)) {
@ -3830,7 +3830,7 @@ function doWeb(doc, url) {
 	}
 }');

-REPLACE INTO translators VALUES ('4c164cc8-be7b-4d02-bfbf-37a5622dfd56', '1.0.0b2.r2', '', '2006-12-14 00:40:00', 1, 100, 4, 'The New York Review of Books', 'Simon Kornblith', '^https?://www\.nybooks\.com/', 
+REPLACE INTO translators VALUES ('4c164cc8-be7b-4d02-bfbf-37a5622dfd56', '1.0.0b3.r1', '', '2006-12-14 00:40:00', 1, 100, 4, 'The New York Review of Books', 'Simon Kornblith', '^https?://www\.nybooks\.com/', 
 'function detectWeb(doc, url) {
 	var articleRegexp = /^http:\/\/www\.nybooks\.com\/articles\/[0-9]+\/?/
 	if(articleRegexp.test(url)) {
@ -4030,7 +4030,7 @@ function doWeb(doc, url) {
 	}
 }');

-REPLACE INTO translators VALUES ('a07bb62a-4d2d-4d43-ba08-d9679a0122f8', '1.0.0b2.r2', '', '2006-12-12 23:41:00', 1, 100, 4, 'ABC-CLIO Serials Web', 'Simon Kornblith', '^http://serials\.abc-clio\.com/active/go/ABC-Clio-Serials_v4.1$', 
+REPLACE INTO translators VALUES ('a07bb62a-4d2d-4d43-ba08-d9679a0122f8', '1.0.0b3.r1', '', '2007-01-08 04:10:00', 1, 100, 4, 'ABC-CLIO Serials Web', 'Simon Kornblith', '^http://serials\.abc-clio\.com/active/go/ABC-Clio-Serials_v4', 
 'function detectWeb(doc, url) {
 	var namespace = doc.documentElement.namespaceURI;
 	var nsResolver = namespace ? function(prefix) {
@ -4159,7 +4159,7 @@ REPLACE INTO translators VALUES ('a07bb62a-4d2d-4d43-ba08-d9679a0122f8', '1.0.0b
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('fa396dd4-7d04-4f99-95e1-93d6f355441d', '1.0.0b2.r2', '', '2006-12-11 18:37:00', 1, 100, 4, 'CiteSeer', 'Simon Kornblith', '^http://(?:citeseer\.ist\.psu\.edu/|citeseer\.csail\.mit\.edu/|citeseer\.ifi\.unizh\.ch/|citeseer\.comp\.nus\.edu\.sg/)', 
+REPLACE INTO translators VALUES ('fa396dd4-7d04-4f99-95e1-93d6f355441d', '1.0.0b3.r1', '', '2006-12-11 18:37:00', 1, 100, 4, 'CiteSeer', 'Simon Kornblith', '^http://(?:citeseer\.ist\.psu\.edu/|citeseer\.csail\.mit\.edu/|citeseer\.ifi\.unizh\.ch/|citeseer\.comp\.nus\.edu\.sg/)', 
 'function detectWeb(doc, url) {
 	var searchRe = /http:\/\/[^\/]+\/ci?s/;
 	if(searchRe.test(url)) {
@ -4401,7 +4401,7 @@ function doWeb(doc, url) {
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('b6d0a7a-d076-48ae-b2f0-b6de28b194e', '1.0.0b2.r2', '', '2006-12-15 18:49:00', 1, 100, 4, 'ScienceDirect', 'Simon Kornblith', '^http://www\.sciencedirect\.com/science\?(?:.+\&|)_ob=(?:ArticleURL|ArticleListURL|PublicationURL)', 
+REPLACE INTO translators VALUES ('b6d0a7a-d076-48ae-b2f0-b6de28b194e', '1.0.0b3.r1', '', '2006-12-15 18:49:00', 1, 100, 4, 'ScienceDirect', 'Simon Kornblith', '^http://www\.sciencedirect\.com/science\?(?:.+\&|)_ob=(?:ArticleURL|ArticleListURL|PublicationURL)', 
 'function detectWeb(doc, url) {
 	if(url.indexOf("_ob=ArticleURL") == -1) {
 		return "multiple";
@ -4546,7 +4546,7 @@ function doWeb(doc, url) {
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('cde4428-5434-437f-9cd9-2281d14dbf9', '1.0.0b2.r2', '', '2006-12-15 22:19:00', 1, 100, 4, 'Ovid', 'Simon Kornblith', '/gw1/ovidweb\.cgi', 
+REPLACE INTO translators VALUES ('cde4428-5434-437f-9cd9-2281d14dbf9', '1.0.0b3.r1', '', '2006-12-15 22:19:00', 1, 100, 4, 'Ovid', 'Simon Kornblith', '/gw1/ovidweb\.cgi', 
 'function detectWeb(doc, url) {
 	var namespace = doc.documentElement.namespaceURI;
 	var nsResolver = namespace ? function(prefix) {
@ -4691,7 +4691,7 @@ REPLACE INTO translators VALUES ('cde4428-5434-437f-9cd9-2281d14dbf9', '1.0.0b2.
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('cb48083-4d9-4ed-ac95-2e93dceea0ec', '1.0.0b2.r2', '', '2006-12-15 23:31:00', 1, 100, 4, 'Blackwell Synergy', 'Simon Kornblith', '^http://www\.blackwell-synergy\.com/(?:action/doSearch|doi/)', 
+REPLACE INTO translators VALUES ('cb48083-4d9-4ed-ac95-2e93dceea0ec', '1.0.0b3.r1', '', '2006-12-15 23:31:00', 1, 100, 4, 'Blackwell Synergy', 'Simon Kornblith', '^http://www\.blackwell-synergy\.com/(?:action/doSearch|doi/)', 
 'function detectWeb(doc, url) {
 	if(url.indexOf("doSearch") != -1) {
 		return "multiple";
@ -4959,7 +4959,7 @@ REPLACE INTO translators VALUES ('6614a99-479a-4524-8e30-686e4d66663e', '1.0.0b3
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('92d4ed84-8d0-4d3c-941f-d4b9124cfbb', '1.0.0b2.r2', '', '2006-12-16 16:29:00', 1, 100, 4, 'IEEE Xplore', 'Simon Kornblith', '^http://ieeexplore.ieee.org/(?:[^\?]+\?(?:|.*&)arnumber=[0-9]+|search/(?:searchresult.jsp|selected.jsp))', 
+REPLACE INTO translators VALUES ('92d4ed84-8d0-4d3c-941f-d4b9124cfbb', '1.0.0b3.r1', '', '2006-12-16 16:29:00', 1, 100, 4, 'IEEE Xplore', 'Simon Kornblith', '^http://ieeexplore.ieee.org/(?:[^\?]+\?(?:|.*&)arnumber=[0-9]+|search/(?:searchresult.jsp|selected.jsp))', 
 'function detectWeb(doc, url) {
 	var articleRe = /[?&]arnumber=([0-9]+)/;
 	var m = articleRe.exec(url);
@ -5056,7 +5056,7 @@ REPLACE INTO translators VALUES ('92d4ed84-8d0-4d3c-941f-d4b9124cfbb', '1.0.0b2.
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('7bdb79e-a47f-4e3d-b317-ccd5a0a74456', '1.0.0b3r1', '', '2006-12-17 20:20:46', '1', '100', '4', 'Factiva', 'Simon Kornblith', '^http://global\.factiva\.com/ha/default\.aspx$', 
+REPLACE INTO translators VALUES ('7bdb79e-a47f-4e3d-b317-ccd5a0a74456', '1.0.0b3.r1', '', '2006-12-17 20:20:46', '1', '100', '4', 'Factiva', 'Simon Kornblith', '^http://global\.factiva\.com/ha/default\.aspx$', 
 'function detectWeb(doc, url) {
 	var namespace = doc.documentElement.namespaceURI;
 	var nsResolver = namespace ? function(prefix) {
@ -5180,7 +5180,7 @@ REPLACE INTO translators VALUES ('7bdb79e-a47f-4e3d-b317-ccd5a0a74456', '1.0.0b3
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('82174f4f-8c13-403b-99b2-affc7bc7769b', '1.0.0b3r1', '', '2006-12-17 04:33:24', '1', '100', '4', 'Cambridge Scientific Abstracts', 'Simon Kornblith', 'https?://[^/]+/ids70/(?:results.php|view_record.php)', 
+REPLACE INTO translators VALUES ('82174f4f-8c13-403b-99b2-affc7bc7769b', '1.0.0b3.r1', '', '2006-12-17 04:33:24', '1', '100', '4', 'Cambridge Scientific Abstracts', 'Simon Kornblith', 'https?://[^/]+/ids70/(?:results.php|view_record.php)', 
 'function detectWeb(doc, url) {
 	var namespace = doc.documentElement.namespaceURI;
 	var nsResolver = namespace ? function(prefix) {
@ -5372,7 +5372,7 @@ function doWeb(doc, url) {
 	}
 }');

-REPLACE INTO translators VALUES ('e78d20f7-488-4023-831-dfe39679f3f', '1.0.0b3r1', '', '2006-12-17 06:44:14', '1', '100', '4', 'ACM', 'Simon Kornblith', '^http://portal\.acm\.org/(?:results\.cfm|citation\.cfm)', 
+REPLACE INTO translators VALUES ('e78d20f7-488-4023-831-dfe39679f3f', '1.0.0b3.r1', '', '2006-12-17 06:44:14', '1', '100', '4', 'ACM', 'Simon Kornblith', '^http://portal\.acm\.org/(?:results\.cfm|citation\.cfm)', 
 'function detectWeb(doc, url) {
 	if(url.indexOf("/results.cfm") != -1) {
 		var items = Zotero.Utilities.getItemArray(doc, doc, ''^https?://[^/]+/citation.cfm\\?[^#]+$'');
@ -5470,7 +5470,7 @@ function doWeb(doc, url) {
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('21ad38-3830-4836-aed7-7b5c2dbfa740', '1.0.0b3r1', '', '2006-12-18 01:28:04', '1', '100', '4', 'ISI Web of Knowledge', 'Simon Kornblith', '^https?://[^/]+/(?:[^/]+/CIW\.cgi|portal\.cgi)', 
+REPLACE INTO translators VALUES ('21ad38-3830-4836-aed7-7b5c2dbfa740', '1.0.0b3.r1', '', '2006-12-18 01:28:04', '1', '100', '4', 'ISI Web of Knowledge', 'Simon Kornblith', '^https?://[^/]+/(?:[^/]+/CIW\.cgi|portal\.cgi)', 
 'function detectWeb(doc, url) {
 	var namespace = doc.documentElement.namespaceURI;
 	var nsResolver = namespace ? function(prefix) {
@ -6074,7 +6074,7 @@ function doWeb(doc, url) {
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('a354331-981b-43de-a61-bc26dd1be3a9', '1.0.0b2.r2', '', '2006-12-19 21:25:46', '1', '100', '4', 'AMS MathSciNet', 'Simon Kornblith', '^http://www\.ams\.org/mathscinet/search/(?:publications\.html|publdoc\.html)', 
+REPLACE INTO translators VALUES ('a354331-981b-43de-a61-bc26dd1be3a9', '1.0.0b3.r1', '', '2006-12-19 21:25:46', '1', '100', '4', 'AMS MathSciNet', 'Simon Kornblith', '^http://www\.ams\.org/mathscinet/search/(?:publications\.html|publdoc\.html)', 
 'function detectWeb(doc, url) {
 	var namespace = doc.documentElement.namespaceURI;
 	var nsResolver = namespace ? function(prefix) {
@ -6269,7 +6269,7 @@ function doWeb(doc, url) {
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('e07e9b8c-0e98-4915-bb5a-32a08cb2f365', '1.0.0b2.r2', '', '2006-10-02 17:00:00', 1, 100, 8, 'Open WorldCat', 'Simon Kornblith', 'http://partneraccess.oclc.org/',
+REPLACE INTO translators VALUES ('e07e9b8c-0e98-4915-bb5a-32a08cb2f365', '1.0.0b3.r1', '', '2006-10-02 17:00:00', 1, 100, 8, 'Open WorldCat', 'Simon Kornblith', 'http://partneraccess.oclc.org/',
 'function detectSearch(item) {
 	if(item.itemType == "book" || item.itemType == "bookSection") {
 		return true;
@ -6344,7 +6344,7 @@ function doSearch(item) {
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('11645bd1-0420-45c1-badb-53fb41eeb753', '1.0.0b2.r2', '', '2006-11-27 22:45:00', 1, 100, 8, 'CrossRef', 'Simon Kornblith', 'http://partneraccess.oclc.org/',
+REPLACE INTO translators VALUES ('11645bd1-0420-45c1-badb-53fb41eeb753', '1.0.0b3.r1', '', '2006-11-27 22:45:00', 1, 100, 8, 'CrossRef', 'Simon Kornblith', 'http://partneraccess.oclc.org/',
 'function detectSearch(item) {
 	if(item.itemType == "journalArticle") {
 		return true;
@ -6420,7 +6420,7 @@ function doSearch(item) {
 	Zotero.wait();
 }');

-REPLACE INTO translators VALUES ('af4cf622-eaca-450b-bd45-0f4ba345d081', '1.0.0b2.r2', '', '2006-12-12 22:10:00', 1, 100, 8, 'CiteBase', 'Simon Kornblith', 'http://www.citebase.org/',
+REPLACE INTO translators VALUES ('af4cf622-eaca-450b-bd45-0f4ba345d081', '1.0.0b3.r1', '', '2006-12-12 22:10:00', 1, 100, 8, 'CiteBase', 'Simon Kornblith', 'http://www.citebase.org/',
 'function detectSearch(item) {
 	if(item.itemType == "journalArticle") {
 		return true;
@ -7450,7 +7450,7 @@ function doExport() {
 	}
 }');

-REPLACE INTO translators VALUES ('6e372642-ed9d-4934-b5d1-c11ac758ebb7', '1.0.0b2.r2', '', '2006-10-02 17:00:00', 1, 100, 2, 'Unqualified Dublin Core RDF', 'Simon Kornblith', 'rdf',
+REPLACE INTO translators VALUES ('6e372642-ed9d-4934-b5d1-c11ac758ebb7', '1.0.0b3.r1', '', '2006-10-02 17:00:00', 1, 100, 2, 'Unqualified Dublin Core RDF', 'Simon Kornblith', 'rdf',
 'Zotero.configure("dataMode", "rdf");',
 'function doExport() {
 	var dc = "http://purl.org/dc/elements/1.1/";
@ -9645,7 +9645,7 @@ function doImport() {
 	}
 }');

-REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/apa.csl', '2006-12-11 15:57:00', 'American Psychological Association',
+REPLACE INTO csl VALUES('http://purl.org/net/xbiblio/csl/styles/apa.csl', '2006-12-11 15:57:00', 'American Psychological Association',
 '<?xml version="1.0" encoding="UTF-8"?>
 <?oxygen RNGSchema="../schema/trunk/csl.rnc" type="compact"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="author-date" xml:lang="en">
@ -9806,7 +9806,7 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/apa.csl', '200
  </bibliography>
 </style>');

-REPLACE INTO "csl" VALUES('http://www.zotero.org/namespaces/CSL/chicago-author-date.csl', '2006-12-20 03:33:00', 'Chicago Manual of Style (Author-Date)',
+REPLACE INTO csl VALUES('http://www.zotero.org/namespaces/CSL/chicago-author-date.csl', '2006-12-20 03:33:00', 'Chicago Manual of Style (Author-Date)',
 '<?xml version="1.0" encoding="UTF-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="author-date" xml:lang="en">
 	<info>
@ -9970,7 +9970,7 @@ REPLACE INTO "csl" VALUES('http://www.zotero.org/namespaces/CSL/chicago-author-d
 	</bibliography>
 </style>');

-REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.csl', '2006-12-20 04:20:00', 'Chicago Manual of Style (Note without Bibliography)',
+REPLACE INTO csl VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.csl', '2006-12-20 04:20:00', 'Chicago Manual of Style (Note without Bibliography)',
 '<?xml version="1.0" encoding="UTF-8"?>
 <?oxygen RNGSchema="../schema/trunk/csl.rnc" type="compact"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="en">
@ -10116,7 +10116,7 @@ REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.c
  </citation>
 </style>');

-REPLACE INTO "csl" VALUES('http://www.zotero.org/namespaces/CSL/chicago-note-bibliography.csl', '2006-12-20 03:57:00', 'Chicago Manual of Style (Note with Bibliography)',
+REPLACE INTO csl VALUES('http://www.zotero.org/namespaces/CSL/chicago-note-bibliography.csl', '2006-12-20 03:57:00', 'Chicago Manual of Style (Note with Bibliography)',
 '<?xml version="1.0" encoding="UTF-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="en">
 	<info>
@ -10275,7 +10275,7 @@ REPLACE INTO "csl" VALUES('http://www.zotero.org/namespaces/CSL/chicago-note-bib
 	</bibliography>
 </style>');

-REPLACE INTO "csl" VALUES('http://purl.org/net/xbiblio/csl/styles/mla.csl', '2006-10-23 00:21:00', 'Modern Language Association',
+REPLACE INTO csl VALUES('http://purl.org/net/xbiblio/csl/styles/mla.csl', '2006-10-23 00:21:00', 'Modern Language Association',
 '<?xml version="1.0" encoding="UTF-8"?>
 <?oxygen RNGSchema="../schema/trunk/csl.rnc" type="compact"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="author" xml:lang="en">