From 23160c5c6ea935626b5a3f4bf5e7c63e8b99bac8 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 19 Oct 2006 21:53:02 +0000
Subject: [PATCH] Changed all entities in zotero.dtd to have a "zotero." prefix
 -- the odds of collisions with other extensions are quite low, but we should
 be a responsible neighbor regardless

(Note that these aren't all used in the global overlay and wouldn't need the zotero prefix if they were in separate DTD files (for export, etc.), but I'm not going to take the time to do that.)

Element ids up next...
---
 chrome/content/zotero/addCitationDialog.xul   |  24 +--
 chrome/content/zotero/bibliography.xul        |  14 +-
 chrome/content/zotero/exportOptions.xul       |   6 +-
 chrome/content/zotero/fileProgress.xul        |   2 +-
 .../content/zotero/ingester/selectitems.xul   |   4 +-
 chrome/content/zotero/integrationDocPrefs.xul |   4 +-
 chrome/content/zotero/itemPane.xul            |  16 +-
 chrome/content/zotero/overlay.xul             |  94 ++++++------
 chrome/content/zotero/selectItemsDialog.xul   |  12 +-
 chrome/locale/en-US/zotero/zotero.dtd         | 143 +++++++++---------
 10 files changed, 157 insertions(+), 162 deletions(-)

diff --git a/chrome/content/zotero/addCitationDialog.xul b/chrome/content/zotero/addCitationDialog.xul
index 910f303d7..c8104167e 100644
--- a/chrome/content/zotero/addCitationDialog.xul
+++ b/chrome/content/zotero/addCitationDialog.xul
@@ -44,7 +44,7 @@
 	<hbox flex="1">
 		<vbox flex="1">
 			<hbox align="center" pack="end">
-				<label value="&toolbar.search.label;" control="tb-search"/>
+				<label value="&zotero.toolbar.search.label;" control="tb-search"/>
 				<textbox id="tb-search" type="timed" timeout="250" oncommand="onSearch()" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; }">
 					<toolbarbutton id="tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
 				</textbox>
@@ -57,7 +57,7 @@
 					<treecols>
 						<treecol
 							id="name_column"
-							label="&collections.name_column;"
+							label="&zotero.collections.name_column;"
 							flex="1"
 							primary="true"/>
 					</treecols>
@@ -70,22 +70,22 @@
 					<treecols>
 						<treecol
 							id="title" primary="true"
-							label="&items.title_column;"
+							label="&zotero.items.title_column;"
 							flex="4" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
 							id="firstCreator"
-							label="&items.creator_column;"
+							label="&zotero.items.creator_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
 							id="dateAdded" hidden="true"
-							label="&items.dateAdded_column;"
+							label="&zotero.items.dateAdded_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
 							id="dateModified" hidden="true"
-							label="&items.dateModified_column;"
+							label="&zotero.items.dateModified_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 					</treecols>				
 					<treechildren/>
@@ -95,9 +95,9 @@
 			<hbox>
 				<menulist id="tree-locator-type">
 					<menupopup id="tree-locator-type-popup">
-						<menuitem value="p" label="&citation.page;" selected="1"/>
-						<menuitem value="g" label="&citation.paragraph;"/>
-						<menuitem value="l" label="&citation.line;"/>
+						<menuitem value="p" label="&zotero.citation.page;" selected="1"/>
+						<menuitem value="g" label="&zotero.citation.paragraph;"/>
+						<menuitem value="l" label="&zotero.citation.line;"/>
 					</menupopup>
 				</menulist>
 				<textbox id="tree-locator" flex="1"/>
@@ -115,9 +115,9 @@
 				<hbox>				
 					<menulist id="item-locator-type" disabled="true">
 						<menupopup id="item-locator-type-popup">
-							<menuitem value="p" label="&citation.page;"/>
-							<menuitem value="g" label="&citation.paragraph;"/>
-							<menuitem value="l" label="&citation.line;"/>
+							<menuitem value="p" label="&zotero.citation.page;"/>
+							<menuitem value="g" label="&zotero.citation.paragraph;"/>
+							<menuitem value="l" label="&zotero.citation.line;"/>
 						</menupopup>
 					</menulist>
 					<textbox id="item-locator"/>
diff --git a/chrome/content/zotero/bibliography.xul b/chrome/content/zotero/bibliography.xul
index 2c57ab715..82e9a8665 100644
--- a/chrome/content/zotero/bibliography.xul
+++ b/chrome/content/zotero/bibliography.xul
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	title="&bibliography.title;" buttons="cancel,accept"
+	title="&zotero.bibliography.title;" buttons="cancel,accept"
 	ondialogaccept="Zotero_File_Interface_Bibliography.acceptSelection()"
 	id="zotero-bibliography"
 	onload="Zotero_File_Interface_Bibliography.init()">
@@ -11,19 +11,19 @@
 <script src="bibliography.js"/>
 
 <hbox>
-	<label value="&bibliography.style.label;" control="style-menu"/>
+	<label value="&zotero.bibliography.style.label;" control="style-menu"/>
 	<menulist id="style-menu">
 		<menupopup id="style-popup">
 		</menupopup>
 	</menulist>
 </hbox>
 <groupbox>
-	<caption label="&bibliography.output.label;"/>
+	<caption label="&zotero.bibliography.output.label;"/>
 	<radiogroup id="output-radio">
-		<radio id="save-as-rtf" selected="true" label="&bibliography.saveAsRTF.label;"/>
-		<radio id="save-as-html" label="&bibliography.saveAsHTML.label;"/>
-		<radio id="copy-to-clipboard" label="&bibliography.copyToClipboard.label;"/>
-		<radio id="print" label="&bibliography.print.label;"/>
+		<radio id="save-as-rtf" selected="true" label="&zotero.bibliography.saveAsRTF.label;"/>
+		<radio id="save-as-html" label="&zotero.bibliography.saveAsHTML.label;"/>
+		<radio id="copy-to-clipboard" label="&zotero.bibliography.copyToClipboard.label;"/>
+		<radio id="print" label="&zotero.bibliography.print.label;"/>
 	</radiogroup>
 </groupbox>
 
diff --git a/chrome/content/zotero/exportOptions.xul b/chrome/content/zotero/exportOptions.xul
index bf872f23a..ef59eff76 100644
--- a/chrome/content/zotero/exportOptions.xul
+++ b/chrome/content/zotero/exportOptions.xul
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	title="&exportOptions.title;" buttons="cancel,accept"
+	title="&zotero.exportOptions.title;" buttons="cancel,accept"
 	ondialogaccept="Zotero_File_Interface_Export.accept()"
 	ondialogcancel="Zotero_File_Interface_Export.cancel()"
 	id="zotero-export-options"
@@ -11,13 +11,13 @@
 <script src="include.js"/>
 <script src="exportOptions.js"/>
 <hbox>
-	<label value="&exportOptions.format.label;" control="format-menu"/>
+	<label value="&zotero.exportOptions.format.label;" control="format-menu"/>
 	<menulist id="format-menu" oncommand="Zotero_File_Interface_Export.updateOptions()">
 		<menupopup id="format-popup">
 		</menupopup>
 	</menulist>
 </hbox>
 <groupbox id="translator-options">
-	<caption label="&exportOptions.translatorOptions.label;"/>
+	<caption label="&zotero.exportOptions.translatorOptions.label;"/>
 </groupbox>
 </dialog>
\ No newline at end of file
diff --git a/chrome/content/zotero/fileProgress.xul b/chrome/content/zotero/fileProgress.xul
index 5126d8fb7..ed2e0160a 100644
--- a/chrome/content/zotero/fileProgress.xul
+++ b/chrome/content/zotero/fileProgress.xul
@@ -3,7 +3,7 @@
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	title="&progress.title;" width="300" height="30"
+	title="&zotero.progress.title;" width="300" height="30"
 	id="zotero-progress">
 	<vbox style="padding:10px">
 		<hbox align="stretch">
diff --git a/chrome/content/zotero/ingester/selectitems.xul b/chrome/content/zotero/ingester/selectitems.xul
index af2eff703..df2bffa6d 100755
--- a/chrome/content/zotero/ingester/selectitems.xul
+++ b/chrome/content/zotero/ingester/selectitems.xul
@@ -3,7 +3,7 @@
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 <dialog xmlns:html="http://www.w3.org/1999/xhtml"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	title="&selectitems.title;" width="400" height="330"
+	title="&zotero.selectitems.title;" width="400" height="330"
 	persist="width height screenX screenY"
 	buttons="cancel,accept"
 	ondialogaccept="Zotero_Ingester_Interface_SelectItems.acceptSelection()"
@@ -12,7 +12,7 @@
 	
 	<script src="../include.js"/>
 	<script src="selectitems.js"/>
-	<caption label="&selectitems.intro.label;" id="zotero-selectitems-intro"/>
+	<caption label="&zotero.selectitems.intro.label;" id="zotero-selectitems-intro"/>
 	<box flex="1">
 		<listbox id="zotero-selectitems-links" flex="1" context="zoteroSelectContext"></listbox>
 	</box>
diff --git a/chrome/content/zotero/integrationDocPrefs.xul b/chrome/content/zotero/integrationDocPrefs.xul
index 5ea18f112..b374df06c 100644
--- a/chrome/content/zotero/integrationDocPrefs.xul
+++ b/chrome/content/zotero/integrationDocPrefs.xul
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	title="&integration.docPrefs.title;" buttons="accept"
+	title="&zotero.integration.docPrefs.title;" buttons="accept"
 	ondialogaccept="Zotero_File_Interface_Bibliography.acceptSelection()"
 	id="zotero-bibliography"
 	onload="Zotero_File_Interface_Bibliography.init()">
@@ -11,7 +11,7 @@
 <script src="bibliography.js"/>
 
 <hbox>
-	<label value="&bibliography.style.label;" control="style-menu"/>
+	<label value="&zotero.bibliography.style.label;" control="style-menu"/>
 	<menulist id="style-menu">
 		<menupopup id="style-popup">
 		</menupopup>
diff --git a/chrome/content/zotero/itemPane.xul b/chrome/content/zotero/itemPane.xul
index fb2855c33..7914ea5ce 100644
--- a/chrome/content/zotero/itemPane.xul
+++ b/chrome/content/zotero/itemPane.xul
@@ -38,8 +38,8 @@
 								'typeID', typeID, otherFields)"/>
 				</popupset>
 				<hbox align="center">
-					<button id="tb-go-to-url" label="&toolbar.goToURL.label;" tooltiptext="&toolbar.goToURL.tooltip;" flex="1" oncommand="window.loadURI(this.getAttribute('viewURL'))" disabled="false"/>
-					<button id="tb-openurl" label="&toolbar.openURL.label;" tooltiptext="&toolbar.openURL.tooltip;" flex="1" oncommand="ZoteroItemPane.onOpenURLClick();"/>
+					<button id="tb-go-to-url" label="&zotero.toolbar.goToURL.label;" tooltiptext="&zotero.toolbar.goToURL.tooltip;" flex="1" oncommand="window.loadURI(this.getAttribute('viewURL'))" disabled="false"/>
+					<button id="tb-openurl" label="&zotero.toolbar.openURL.label;" tooltiptext="&zotero.toolbar.openURL.tooltip;" flex="1" oncommand="ZoteroItemPane.onOpenURLClick();"/>
 				</hbox>
 				<hbox align="center">
 					<menulist id="editpane-type-menu" oncommand="ZoteroItemPane.changeTypeTo(this.value)" flex="1">
@@ -57,7 +57,7 @@
 			<vbox flex="1">
 				<hbox align="center">
 					<label id="editpane-notes-label"/>
-					<button label="&item.add;" oncommand="ZoteroItemPane.addNote();"/>
+					<button label="&zotero.item.add;" oncommand="ZoteroItemPane.addNote();"/>
 				</hbox>
 				<grid flex="1">
 					<columns>
@@ -70,12 +70,12 @@
 			<vbox flex="1">
 				<hbox align="center">
 					<label id="editpane-attachments-label"/>
-					<button id="tb-item-attachments-add" type="menu" label="&item.add;">
+					<button id="tb-item-attachments-add" type="menu" label="&zotero.item.add;">
 						<menupopup>
-							<menuitem class="menuitem-iconic" id="tb-item-attachments-link" label="&toolbar.attachment.linked;" oncommand="ZoteroItemPane.addAttachmentFromDialog(true);"/>
-							<menuitem class="menuitem-iconic" id="tb-item-attachments-file" label="&toolbar.attachment.add;" oncommand="ZoteroItemPane.addAttachmentFromDialog();"/>
-							<menuitem class="menuitem-iconic" id="tb-item-attachments-web-link" label="&toolbar.attachment.weblink;" oncommand="ZoteroItemPane.addAttachmentFromPage(true);"/>
-							<menuitem class="menuitem-iconic" id="tb-item-attachments-snapshot" label="&toolbar.attachment.snapshot;" oncommand="ZoteroItemPane.addAttachmentFromPage();"/>
+							<menuitem class="menuitem-iconic" id="tb-item-attachments-link" label="&zotero.toolbar.attachment.linked;" oncommand="ZoteroItemPane.addAttachmentFromDialog(true);"/>
+							<menuitem class="menuitem-iconic" id="tb-item-attachments-file" label="&zotero.toolbar.attachment.add;" oncommand="ZoteroItemPane.addAttachmentFromDialog();"/>
+							<menuitem class="menuitem-iconic" id="tb-item-attachments-web-link" label="&zotero.toolbar.attachment.weblink;" oncommand="ZoteroItemPane.addAttachmentFromPage(true);"/>
+							<menuitem class="menuitem-iconic" id="tb-item-attachments-snapshot" label="&zotero.toolbar.attachment.snapshot;" oncommand="ZoteroItemPane.addAttachmentFromPage();"/>
 						</menupopup>
 					</button>
 				</hbox>
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index d9d05e706..2b2fc6d1f 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -50,23 +50,23 @@
 		<hbox id="zotero-pane" persist="height" collapsed="true" flex="1">
 			<popupset>
 				<popup id="zotero-collectionmenu" onpopupshowing="ZoteroPane.buildCollectionContextMenu();">
-					<menuitem label="&toolbar.newCollection.label;" command="cmd_zotero_newCollection"/>
-					<menuitem label="&toolbar.newSavedSearch.label;" oncommand="ZoteroPane.newSearch()"/>
+					<menuitem label="&zotero.toolbar.newCollection.label;" command="cmd_zotero_newCollection"/>
+					<menuitem label="&zotero.toolbar.newSavedSearch.label;" oncommand="ZoteroPane.newSearch()"/>
 					<menuseparator/>
-					<menuitem label="&toolbar.renameCollection.label;" oncommand="ZoteroPane.editSelectedCollection();"/>
-					<menuitem label="&toolbar.renameSavedSearch.label;" oncommand="ZoteroPane.editSelectedCollection()"/>
-					<menuitem label="&toolbar.removeCollection.label;" oncommand="ZoteroPane.deleteSelectedCollection();"/>
-					<menuitem label="&toolbar.removeSavedSearch.label;" oncommand="ZoteroPane.deleteSelectedCollection()"/>
+					<menuitem label="&zotero.toolbar.renameCollection.label;" oncommand="ZoteroPane.editSelectedCollection();"/>
+					<menuitem label="&zotero.toolbar.renameSavedSearch.label;" oncommand="ZoteroPane.editSelectedCollection()"/>
+					<menuitem label="&zotero.toolbar.removeCollection.label;" oncommand="ZoteroPane.deleteSelectedCollection();"/>
+					<menuitem label="&zotero.toolbar.removeSavedSearch.label;" oncommand="ZoteroPane.deleteSelectedCollection()"/>
 					<menuseparator/>
-					<menuitem label="&toolbar.exportCollection.label;" oncommand="Zotero_File_Interface.exportCollection();"/>
-					<menuitem label="&toolbar.exportSavedSearch.label;" oncommand="Zotero_File_Interface.exportCollection()"/>
-					<menuitem label="&toolbar.createBibCollection.label;" oncommand="Zotero_File_Interface.bibliographyFromCollection();"/>
-					<menuitem label="&toolbar.createBibSavedSearch.label;" oncommand="Zotero_File_Interface.bibliographyFromCollection()"/>
-					<menuitem label="&toolbar.export.label;" oncommand="Zotero_File_Interface.exportFile()"/>
+					<menuitem label="&zotero.toolbar.exportCollection.label;" oncommand="Zotero_File_Interface.exportCollection();"/>
+					<menuitem label="&zotero.toolbar.exportSavedSearch.label;" oncommand="Zotero_File_Interface.exportCollection()"/>
+					<menuitem label="&zotero.toolbar.createBibCollection.label;" oncommand="Zotero_File_Interface.bibliographyFromCollection();"/>
+					<menuitem label="&zotero.toolbar.createBibSavedSearch.label;" oncommand="Zotero_File_Interface.bibliographyFromCollection()"/>
+					<menuitem label="&zotero.toolbar.export.label;" oncommand="Zotero_File_Interface.exportFile()"/>
 				</popup>
 				<popup id="zotero-itemmenu" onpopupshowing="ZoteroPane.buildItemContextMenu();">
-					<menuitem label="&items.menu.attach.snapshot;" oncommand="ZoteroPane.addAttachmentFromPage(false, this.parentNode.getAttribute('itemID'));"/>
-					<menuitem label="&items.menu.attach.link;" oncommand="ZoteroPane.addAttachmentFromPage(true, this.parentNode.getAttribute('itemID'));"/>
+					<menuitem label="&zotero.items.menu.attach.snapshot;" oncommand="ZoteroPane.addAttachmentFromPage(false, this.parentNode.getAttribute('itemID'));"/>
+					<menuitem label="&zotero.items.menu.attach.link;" oncommand="ZoteroPane.addAttachmentFromPage(true, this.parentNode.getAttribute('itemID'));"/>
 					<menuseparator/>
 					<menuitem oncommand="ZoteroPane.deleteSelectedItem();"/>
 					<menuitem oncommand="ZoteroPane.deleteSelectedItem(true);"/>
@@ -77,17 +77,17 @@
 			</popupset>
 			<vbox id="collections-pane" persist="width" flex="1">
 				<toolbar>
-					<toolbarbutton id="tb-collection-add" tooltiptext="&toolbar.newCollection.label;" command="cmd_zotero_newCollection"/>
-					<toolbarbutton id="tb-collection-addsearch" tooltiptext="&toolbar.newSavedSearch.label;" oncommand="ZoteroPane.newSearch();"/>
-					<toolbarbutton id="tb-collection-rename" tooltiptext="&toolbar.renameCollection.label;" oncommand="ZoteroPane.editSelectedCollection();" disabled="true"/>
+					<toolbarbutton id="tb-collection-add" tooltiptext="&zotero.toolbar.newCollection.label;" command="cmd_zotero_newCollection"/>
+					<toolbarbutton id="tb-collection-addsearch" tooltiptext="&zotero.toolbar.newSavedSearch.label;" oncommand="ZoteroPane.newSearch();"/>
+					<toolbarbutton id="tb-collection-rename" tooltiptext="&zotero.toolbar.renameCollection.label;" oncommand="ZoteroPane.editSelectedCollection();" disabled="true"/>
 					<spacer flex="1"/>
-					<toolbarbutton id="tb-actions-menu" tooltiptext="&toolbar.actions.label;" type="menu">
+					<toolbarbutton id="tb-actions-menu" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
 						<menupopup>
-							<menuitem label="&toolbar.import.label;" oncommand="Zotero_File_Interface.importFile();"/>
-							<menuitem label="&toolbar.export.label;" oncommand="Zotero_File_Interface.exportFile();"/>
+							<menuitem label="&zotero.toolbar.import.label;" oncommand="Zotero_File_Interface.importFile();"/>
+							<menuitem label="&zotero.toolbar.export.label;" oncommand="Zotero_File_Interface.exportFile();"/>
 							<menuseparator/>
-							<menuitem label="&toolbar.preferences.label;" oncommand="window.openDialog('chrome://zotero/content/preferences.xul','prefs','chrome,modal')"/>
-							<menuitem label="&toolbar.about.label;" oncommand="window.openDialog('chrome://zotero/content/about.xul','about','chrome,left=' + (window.screenX + 200) + ',top=' + (window.screenY + 100))"/>
+							<menuitem label="&zotero.toolbar.preferences.label;" oncommand="window.openDialog('chrome://zotero/content/preferences.xul','prefs','chrome,modal')"/>
+							<menuitem label="&zotero.toolbar.about.label;" oncommand="window.openDialog('chrome://zotero/content/about.xul','about','chrome,left=' + (window.screenX + 200) + ',top=' + (window.screenY + 100))"/>
 						</menupopup>
 					</toolbarbutton>
 				</toolbar>
@@ -100,7 +100,7 @@
 					<treecols>
 						<treecol
 							id="name_column"
-							label="&collections.name_column;"
+							label="&zotero.collections.name_column;"
 							flex="1"
 							primary="true"/>
 					</treecols>
@@ -110,25 +110,25 @@
 			<splitter id="zotero-tree-splitter" resizebefore="closest" resizeafter="closest"/>
 			<vbox id="items-pane" persist="width" flex="1">
 				<toolbar align="center">
-					<toolbarbutton id="tb-add" tooltiptext="&toolbar.newItem.label;" type="menu">
+					<toolbarbutton id="tb-add" tooltiptext="&zotero.toolbar.newItem.label;" type="menu">
 						<!-- New Item drop-down built in overlay.js::onLoad() -->
 						<menupopup>
 							<menuseparator/>
-							<menuitem label="&toolbar.attachment.linked;" oncommand="ZoteroPane.addAttachmentFromDialog(true);"/>
-							<menuitem label="&toolbar.attachment.add;" oncommand="ZoteroPane.addAttachmentFromDialog();"/>
+							<menuitem label="&zotero.toolbar.attachment.linked;" oncommand="ZoteroPane.addAttachmentFromDialog(true);"/>
+							<menuitem label="&zotero.toolbar.attachment.add;" oncommand="ZoteroPane.addAttachmentFromDialog();"/>
 							<menuseparator/>
-							<menu label="&toolbar.moreItemTypes.label;">
+							<menu label="&zotero.toolbar.moreItemTypes.label;">
 								<menupopup id="tb-add-more"/>
 							</menu>
 						</menupopup>
 					</toolbarbutton>
-					<toolbarbutton id="tb-item-from-page" tooltiptext="&toolbar.newItemFromPage.label;" oncommand="ZoteroPane.addItemFromPage()"/>
+					<toolbarbutton id="tb-item-from-page" tooltiptext="&zotero.toolbar.newItemFromPage.label;" oncommand="ZoteroPane.addItemFromPage()"/>
 					<toolbarseparator/>
-					<toolbarbutton id="tb-link-page" tooltiptext="&toolbar.attachment.weblink;" oncommand="ZoteroPane.addAttachmentFromPage(true)"/>
-					<toolbarbutton id="tb-snapshot-page" tooltiptext="&toolbar.attachment.snapshot;" oncommand="ZoteroPane.addAttachmentFromPage()"/>
-					<toolbarbutton id="tb-note-add" tooltiptext="&toolbar.note.standalone;" oncommand="ZoteroPane.newNote(event.shiftKey);"/>
+					<toolbarbutton id="tb-link-page" tooltiptext="&zotero.toolbar.attachment.weblink;" oncommand="ZoteroPane.addAttachmentFromPage(true)"/>
+					<toolbarbutton id="tb-snapshot-page" tooltiptext="&zotero.toolbar.attachment.snapshot;" oncommand="ZoteroPane.addAttachmentFromPage()"/>
+					<toolbarbutton id="tb-note-add" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane.newNote(event.shiftKey);"/>
 					<spacer flex="1"/>
-					<label value="&toolbar.search.label;" control="tb-search"/>
+					<label value="&zotero.toolbar.search.label;" control="tb-search"/>
 					<textbox id="tb-search" type="timed" timeout="250" command="cmd_zotero_search" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; }">
 						<toolbarbutton id="tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
 					</textbox>
@@ -146,42 +146,42 @@
 					<treecols>
 						<treecol
 							id="title" primary="true"
-							label="&items.title_column;"
+							label="&zotero.items.title_column;"
 							flex="4" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
 							id="firstCreator"
-							label="&items.creator_column;"
+							label="&zotero.items.creator_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
 							id="numChildren"
-							label="&items.numChildren_column;"
+							label="&zotero.items.numChildren_column;"
 							persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
 							id="typeIcon" hidden="true"
-							label="&items.type_column;"
+							label="&zotero.items.type_column;"
 							width="40" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
 							id="source" hidden="true"
-							label="&items.source_column;"
+							label="&zotero.items.source_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
 							id="rights" hidden="true"
-							label="&items.rights_column;"
+							label="&zotero.items.rights_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
 							id="dateAdded" hidden="true"
-							label="&items.dateAdded_column;"
+							label="&zotero.items.dateAdded_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
 							id="dateModified" hidden="true"
-							label="&items.dateModified_column;"
+							label="&zotero.items.dateModified_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 					</treecols>				
 					<treechildren/>
@@ -190,17 +190,17 @@
 			<splitter id="zotero-view-splitter" resizebefore="closest" resizeafter="closest"/>
 			<vbox>
 				<toolbar align="right">
-					<toolbarbutton id="tb-fullscreen" tooltiptext="&toolbar.fullscreen.tooltip;" oncommand="ZoteroPane.fullScreen();"/>
+					<toolbarbutton id="tb-fullscreen" tooltiptext="&zotero.toolbar.fullscreen.tooltip;" oncommand="ZoteroPane.fullScreen();"/>
 					<toolbarbutton class="tabs-closebutton" oncommand="ZoteroPane.toggleDisplay()"/>
 				</toolbar>
 				<groupbox flex="1">
 					<caption>
 						<tabs id="zotero-view-tabs" onselect="document.getElementById('zotero-view-item').selectedIndex = this.selectedIndex;" hidden="true">
-							<tab label="&tabs.info.label;"/>
-							<tab label="&tabs.notes.label;"/>
-							<tab label="&tabs.attachments.label;"/>
-							<tab label="&tabs.tags.label;"/>
-							<tab label="&tabs.related.label;"/>
+							<tab label="&zotero.tabs.info.label;"/>
+							<tab label="&zotero.tabs.notes.label;"/>
+							<tab label="&zotero.tabs.attachments.label;"/>
+							<tab label="&zotero.tabs.tags.label;"/>
+							<tab label="&zotero.tabs.related.label;"/>
 						</tabs>
 					</caption>
 					<deck id="item-pane" selectedIndex="0" flex="1" onselect="document.getElementById('zotero-view-tabs').setAttribute('hidden',(this.selectedIndex != 1));">
@@ -211,14 +211,14 @@
 						<!-- Note info pane -->
 						<vbox id="zotero-view-note" flex="1">
 							<noteeditor id="zotero-note-editor" flex="1"/>
-							<button id="zotero-view-note-button" label="&notes.separate;" oncommand="ZoteroPane.openNoteWindow(this.getAttribute('noteID')); if(this.hasAttribute('sourceID')) ZoteroPane.selectItem(this.getAttribute('sourceID'));"/>
+							<button id="zotero-view-note-button" label="&zotero.notes.separate;" oncommand="ZoteroPane.openNoteWindow(this.getAttribute('noteID')); if(this.hasAttribute('sourceID')) ZoteroPane.selectItem(this.getAttribute('sourceID'));"/>
 						</vbox>
 						<!-- Attachment info pane -->
 						<vbox id="zotero-view-attachment" flex="1">
 							<label id="zotero-attachment-label"/>
 							<hbox>
 								<button id="zotero-attachment-view" flex="1" oncommand="ZoteroPane.viewSelectedAttachment();"/>
-								<button id="zotero-attachment-show" label="&item.attachment.file.show;" flex="1" oncommand="ZoteroPane.showSelectedAttachmentInFilesystem()"/>
+								<button id="zotero-attachment-show" label="&zotero.item.attachment.file.show;" flex="1" oncommand="ZoteroPane.showSelectedAttachmentInFilesystem()"/>
 							</hbox>
 							<vbox>
 								<label id="zotero-attachment-url" class="text-link" crop="end" onclick="window.loadURI(this.value)"/>
diff --git a/chrome/content/zotero/selectItemsDialog.xul b/chrome/content/zotero/selectItemsDialog.xul
index 0ea030fa2..df2be7ee2 100644
--- a/chrome/content/zotero/selectItemsDialog.xul
+++ b/chrome/content/zotero/selectItemsDialog.xul
@@ -41,7 +41,7 @@
 	<script src="selectItemsDialog.js"/>
 	
 	<hbox align="center" pack="end">
-		<label value="&toolbar.search.label;" control="tb-search"/>
+		<label value="&zotero.toolbar.search.label;" control="tb-search"/>
 		<textbox id="tb-search" type="timed" timeout="250" oncommand="onSearch()" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; }">
 			<toolbarbutton id="tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
 		</textbox>
@@ -54,7 +54,7 @@
 			<treecols>
 				<treecol
 					id="name_column"
-					label="&collections.name_column;"
+					label="&zotero.collections.name_column;"
 					flex="1"
 					primary="true"/>
 			</treecols>
@@ -67,22 +67,22 @@
 			<treecols>
 				<treecol
 					id="title" primary="true"
-					label="&items.title_column;"
+					label="&zotero.items.title_column;"
 					flex="4" persist="width ordinal hidden sortActive sortDirection"/>
 				<splitter class="tree-splitter"/>
 				<treecol
 					id="firstCreator"
-					label="&items.creator_column;"
+					label="&zotero.items.creator_column;"
 					flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 				<splitter class="tree-splitter"/>
 				<treecol
 					id="dateAdded" hidden="true"
-					label="&items.dateAdded_column;"
+					label="&zotero.items.dateAdded_column;"
 					flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 				<splitter class="tree-splitter"/>
 				<treecol
 					id="dateModified" hidden="true"
-					label="&items.dateModified_column;"
+					label="&zotero.items.dateModified_column;"
 					flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 			</treecols>				
 			<treechildren/>
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index d2e914ee5..0987336b3 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -1,88 +1,83 @@
-<!ENTITY zotero.name					"Zotero">
+<!ENTITY zotero.name									"Zotero">
 
-<!ENTITY tabs.info.label				"Info">
-<!ENTITY tabs.notes.label				"Notes">
-<!ENTITY tabs.attachments.label				"Attachments">
-<!ENTITY tabs.tags.label				"Tags">
-<!ENTITY tabs.related.label				"Related">
-<!ENTITY notes.separate					"Edit in a separate window">
+<!ENTITY zotero.tabs.info.label						"Info">
+<!ENTITY zotero.tabs.notes.label						"Notes">
+<!ENTITY zotero.tabs.attachments.label					"Attachments">
+<!ENTITY zotero.tabs.tags.label						"Tags">
+<!ENTITY zotero.tabs.related.label						"Related">
+<!ENTITY zotero.notes.separate							"Edit in a separate window">
 
-<!ENTITY items.type_column 				"Type">
-<!ENTITY items.title_column 			"Title">
-<!ENTITY items.creator_column 			"Creator">
-<!ENTITY items.source_column 			"Source">
-<!ENTITY items.rights_column 			"Rights">
-<!ENTITY items.numChildren_column 		"+">
-<!ENTITY items.dateAdded_column 		"Date Added">
-<!ENTITY items.dateModified_column	 	"Date Modified">
+<!ENTITY zotero.items.type_column						"Type">
+<!ENTITY zotero.items.title_column						"Title">
+<!ENTITY zotero.items.creator_column					"Creator">
+<!ENTITY zotero.items.source_column					"Source">
+<!ENTITY zotero.items.rights_column					"Rights">
+<!ENTITY zotero.items.numChildren_column				"+">
+<!ENTITY zotero.items.dateAdded_column					"Date Added">
+<!ENTITY zotero.items.dateModified_column				"Date Modified">
 
-<!ENTITY items.menu.attach.snapshot 	"Attach Snapshot of Current Page">
-<!ENTITY items.menu.attach.link	 	"Attach Link to Current Page">
+<!ENTITY zotero.items.menu.attach.snapshot				"Attach Snapshot of Current Page">
+<!ENTITY zotero.items.menu.attach.link					"Attach Link to Current Page">
 
-<!ENTITY collections.name_column		"Collections">
+<!ENTITY zotero.collections.name_column				"Collections">
 
-<!ENTITY toolbar.newItem.label    		"New Item">
-<!ENTITY toolbar.moreItemTypes.label	"More">
-<!ENTITY toolbar.newItemFromPage.label		"Create New Item from Current Page">
-<!ENTITY toolbar.removeItem.label 		  "Remove Item...">
-<!ENTITY toolbar.newCollection.label   	"New Collection...">
-<!ENTITY toolbar.newSavedSearch.label   	"New Saved Search...">
-<!ENTITY toolbar.renameCollection.label   "Rename Collection...">
-<!ENTITY toolbar.removeCollection.label   "Remove Collection...">
-<!ENTITY toolbar.exportCollection.label   "Export Collection...">
-<!ENTITY toolbar.renameSavedSearch.label   "Edit Saved Search...">
-<!ENTITY toolbar.removeSavedSearch.label   "Remove Saved Search...">
-<!ENTITY toolbar.exportSavedSearch.label   "Export Saved Search...">
-<!ENTITY toolbar.actions.label			"Actions">
-<!ENTITY toolbar.import.label			"Import...">
-<!ENTITY toolbar.export.label			"Export Library...">
-<!ENTITY toolbar.preferences.label		"Preferences...">
-<!ENTITY toolbar.about.label			"About Zotero...">
-<!ENTITY toolbar.createBibCollection.label   "Create Bibliography From Collection...">
-<!ENTITY toolbar.createBibSavedSearch.label   "Create Bibliography From Saved Search...">
-<!ENTITY toolbar.search.label   			"Search:">
-<!ENTITY toolbar.fullscreen.tooltip		"Toggle Fullscreen Mode">
-<!ENTITY toolbar.goToURL.label   		"View">
-<!ENTITY toolbar.goToURL.tooltip  		"Go to this item online">
-<!ENTITY toolbar.openURL.label 	  	"Locate">
-<!ENTITY toolbar.openURL.tooltip   	"Find through your local library">
+<!ENTITY zotero.toolbar.newItem.label					"New Item">
+<!ENTITY zotero.toolbar.moreItemTypes.label			"More">
+<!ENTITY zotero.toolbar.newItemFromPage.label			"Create New Item from Current Page">
+<!ENTITY zotero.toolbar.removeItem.label				"Remove Item...">
+<!ENTITY zotero.toolbar.newCollection.label			"New Collection...">
+<!ENTITY zotero.toolbar.newSavedSearch.label			"New Saved Search...">
+<!ENTITY zotero.toolbar.renameCollection.label			"Rename Collection...">
+<!ENTITY zotero.toolbar.removeCollection.label			"Remove Collection...">
+<!ENTITY zotero.toolbar.exportCollection.label			"Export Collection...">
+<!ENTITY zotero.toolbar.renameSavedSearch.label		"Edit Saved Search...">
+<!ENTITY zotero.toolbar.removeSavedSearch.label		"Remove Saved Search...">
+<!ENTITY zotero.toolbar.exportSavedSearch.label		"Export Saved Search...">
+<!ENTITY zotero.toolbar.actions.label					"Actions">
+<!ENTITY zotero.toolbar.import.label					"Import...">
+<!ENTITY zotero.toolbar.export.label					"Export Library...">
+<!ENTITY zotero.toolbar.preferences.label				"Preferences...">
+<!ENTITY zotero.toolbar.about.label					"About Zotero...">
+<!ENTITY zotero.toolbar.createBibCollection.label		"Create Bibliography From Collection...">
+<!ENTITY zotero.toolbar.createBibSavedSearch.label		"Create Bibliography From Saved Search...">
+<!ENTITY zotero.toolbar.search.label					"Search:">
+<!ENTITY zotero.toolbar.fullscreen.tooltip				"Toggle Fullscreen Mode">
+<!ENTITY zotero.toolbar.goToURL.label					"View">
+<!ENTITY zotero.toolbar.goToURL.tooltip				"Go to this item online">
+<!ENTITY zotero.toolbar.openURL.label					"Locate">
+<!ENTITY zotero.toolbar.openURL.tooltip				"Find through your local library">
 
 
-<!ENTITY item.add						"Add">
-<!ENTITY item.attachment.file.show		"Show File">
+<!ENTITY zotero.item.add								"Add">
+<!ENTITY zotero.item.attachment.file.show				"Show File">
 
-<!ENTITY toolbar.note.standalone		"New Standalone Note">
-<!ENTITY toolbar.attachment.linked   	"Link to File...">
-<!ENTITY toolbar.attachment.add   		"Store Copy of File...">
-<!ENTITY toolbar.attachment.weblink 	"Save Link to Current Page">
-<!ENTITY toolbar.attachment.snapshot 	"Take Snapshot of Current Page">
+<!ENTITY zotero.toolbar.note.standalone				"New Standalone Note">
+<!ENTITY zotero.toolbar.attachment.linked				"Link to File...">
+<!ENTITY zotero.toolbar.attachment.add					"Store Copy of File...">
+<!ENTITY zotero.toolbar.attachment.weblink				"Save Link to Current Page">
+<!ENTITY zotero.toolbar.attachment.snapshot			"Take Snapshot of Current Page">
 
-<!ENTITY selectitems.title   			"Select Items">
-<!ENTITY selectitems.intro.label   		"Select which items you'd like to add to your library">
-<!ENTITY selectitems.cancel.label   	"Cancel">
-<!ENTITY selectitems.select.label   	"OK">
+<!ENTITY zotero.selectitems.title						"Select Items">
+<!ENTITY zotero.selectitems.intro.label				"Select which items you'd like to add to your library">
+<!ENTITY zotero.selectitems.cancel.label				"Cancel">
+<!ENTITY zotero.selectitems.select.label				"OK">
 
-<!ENTITY bibliography.title				"Create Bibliography">
-<!ENTITY bibliography.style.label		"Citation Style:">
-<!ENTITY bibliography.output.label		"Output Format">
-<!ENTITY bibliography.saveAsRTF.label	"Save as RTF">
-<!ENTITY bibliography.saveAsHTML.label	"Save as HTML">
-<!ENTITY bibliography.copyToClipboard.label	"Copy to Clipboard">
-<!ENTITY bibliography.print.label		"Print">
+<!ENTITY zotero.bibliography.title						"Create Bibliography">
+<!ENTITY zotero.bibliography.style.label				"Citation Style:">
+<!ENTITY zotero.bibliography.output.label				"Output Format">
+<!ENTITY zotero.bibliography.saveAsRTF.label			"Save as RTF">
+<!ENTITY zotero.bibliography.saveAsHTML.label			"Save as HTML">
+<!ENTITY zotero.bibliography.copyToClipboard.label		"Copy to Clipboard">
+<!ENTITY zotero.bibliography.print.label				"Print">
 
-<!ENTITY integration.docPrefs.title		"Document Preferences">
+<!ENTITY zotero.integration.docPrefs.title				"Document Preferences">
 
-<!ENTITY progress.title					"Progress">
+<!ENTITY zotero.progress.title							"Progress">
 
-<!ENTITY exportOptions.title            "Export...">
-<!ENTITY exportOptions.format.label     "Format:">
-<!ENTITY exportOptions.translatorOptions.label     "Translator Options">
+<!ENTITY zotero.exportOptions.title					"Export...">
+<!ENTITY zotero.exportOptions.format.label				"Format:">
+<!ENTITY zotero.exportOptions.translatorOptions.label	"Translator Options">
 
-<!ENTITY search.match					"Match">
-<!ENTITY search.any						"any">
-<!ENTITY search.all						"all">
-<!ENTITY search.following				"of the following">
-
-<!ENTITY citation.page					"Page">
-<!ENTITY citation.paragraph				"Paragraph">
-<!ENTITY citation.line					"Line">
\ No newline at end of file
+<!ENTITY zotero.citation.page							"Page">
+<!ENTITY zotero.citation.paragraph						"Paragraph">
+<!ENTITY zotero.citation.line							"Line">
\ No newline at end of file