From 6ad7acf4d8d87b412e273ab9b87180ff9e4cbcde Mon Sep 17 00:00:00 2001
From: David Norton <david@nortoncrew.com>
Date: Wed, 2 Aug 2006 17:57:16 +0000
Subject: [PATCH] Addressed #155, Localize strings

---
 chrome/chromeFiles/content/scholar/about.xul  | 13 ++++++-----
 .../chromeFiles/content/scholar/itemPane.xul  | 12 +++++-----
 chrome/chromeFiles/content/scholar/overlay.js |  4 ++--
 .../chromeFiles/content/scholar/overlay.xul   | 22 +++++++++----------
 .../locale/en-US/scholar/about.dtd            |  6 +++++
 .../locale/en-US/scholar/scholar.dtd          | 16 +++++++++++---
 .../locale/en-US/scholar/scholar.properties   |  3 +++
 7 files changed, 48 insertions(+), 28 deletions(-)
 create mode 100644 chrome/chromeFiles/locale/en-US/scholar/about.dtd

diff --git a/chrome/chromeFiles/content/scholar/about.xul b/chrome/chromeFiles/content/scholar/about.xul
index e9cad85b4..3820a4ec1 100644
--- a/chrome/chromeFiles/content/scholar/about.xul
+++ b/chrome/chromeFiles/content/scholar/about.xul
@@ -21,6 +21,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://scholar/skin/scholar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://scholar/skin/about.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://scholar/locale/about.dtd">
 
 <dialog
     id="scholar-about"
@@ -43,25 +44,25 @@
 	</script>
 	
 	<vbox id="aboutcontent">
-		<label id="name" value="Scholar for Firefox"/>
-		<label id="version" value="version 1.0a1"/>
+		<label id="name" value="&scholar.name;"/>
+		<label id="version" value="&scholar.version;"/>
 		
-		<label class="subhead" value="Created by:"/>
+		<label class="subhead" value="&scholar.createdby;"/>
 		<vbox class="subcontent">
 			<label class="text-link" href="http://chnm.gmu.edu" value="Center for History and New Media"/>
 		</vbox>
-		<label class="subhead" value="Directors:"/>
+		<label class="subhead" value="&scholar.directors;"/>
 		<vbox class="subcontent">
 			<label value="Dan Cohen"/>
 			<label value="Josh Greenberg"/>
 		</vbox>
-		<label class="subhead" value="Developers:"/>
+		<label class="subhead" value="&scholar.developers;"/>
 		<vbox class="subcontent">
 			<label value="Dan Stillman"/>
 			<label value="David Norton"/>
 			<label value="Simon Kornblith"/>
 		</vbox>
-		<label class="subhead" value="Special Thanks:"/>
+		<label class="subhead" value="&scholar.thanks;"/>
 		<vbox class="subcontent">
 			<label class="text-link" href="http://www.imls.gov/" value="Institute of Museum and Library Services"/>
 			<label class="text-link" href="http://www.mozilla.org/" value="Mozilla Foundation"/>
diff --git a/chrome/chromeFiles/content/scholar/itemPane.xul b/chrome/chromeFiles/content/scholar/itemPane.xul
index 5ddba72d4..74705f5bd 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.xul
+++ b/chrome/chromeFiles/content/scholar/itemPane.xul
@@ -43,7 +43,7 @@
 			<vbox flex="1">
 				<hbox align="center">
 					<label id="editpane-notes-label"/>
-					<button label="Add Note" oncommand="ScholarItemPane.addNote();"/>
+					<button label="&item.add;" oncommand="ScholarItemPane.addNote();"/>
 				</hbox>
 				<grid flex="1">
 					<columns>
@@ -56,12 +56,12 @@
 			<vbox flex="1">
 				<hbox align="center">
 					<label id="editpane-files-label"/>
-					<button id="tb-item-files-add" type="menu" label="Add">
+					<button id="tb-item-files-add" type="menu" label="&item.add;">
 						<menupopup>
-							<menuitem class="menuitem-iconic" id="tb-item-files-file" label="Add File..." oncommand="ScholarItemPane.addFileFromDialog();"/>
-							<menuitem class="menuitem-iconic" id="tb-item-files-link" label="Add Linked File..." oncommand="ScholarItemPane.addFileFromDialog(true);"/>
-							<menuitem class="menuitem-iconic" id="tb-item-files-snapshot" label="Snapshot Current Page" oncommand="ScholarItemPane.addFileFromPage();"/>
-							<menuitem class="menuitem-iconic" id="tb-item-files-web-link" label="Link to Current Page" oncommand="ScholarItemPane.addFileFromPage(true);"/>
+							<menuitem class="menuitem-iconic" id="tb-item-files-file" label="&toolbar.file.add;" oncommand="ScholarItemPane.addFileFromDialog();"/>
+							<menuitem class="menuitem-iconic" id="tb-item-files-link" label="&toolbar.file.linked;" oncommand="ScholarItemPane.addFileFromDialog(true);"/>
+							<menuitem class="menuitem-iconic" id="tb-item-files-snapshot" label="&toolbar.file.snapshot;" oncommand="ScholarItemPane.addFileFromPage();"/>
+							<menuitem class="menuitem-iconic" id="tb-item-files-web-link" label="&toolbar.file.weblink;" oncommand="ScholarItemPane.addFileFromPage(true);"/>
 						</menupopup>
 					</button>
 				</hbox>
diff --git a/chrome/chromeFiles/content/scholar/overlay.js b/chrome/chromeFiles/content/scholar/overlay.js
index c0f233229..422e5263c 100644
--- a/chrome/chromeFiles/content/scholar/overlay.js
+++ b/chrome/chromeFiles/content/scholar/overlay.js
@@ -242,7 +242,7 @@ var ScholarPane = new function()
 			var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
                     						.getService(Components.interfaces.nsIPromptService);
 
-			if(promptService.confirmCheck(window, 'Delete Item', Scholar.getString('pane.items.delete'), 'Erase attached notes and files', eraseChildren))
+			if(promptService.confirmCheck(window, Scholar.getString('pane.items.delete.title'), Scholar.getString('pane.items.delete'), Scholar.getString('pane.items.delete.attached'), eraseChildren))
 				itemsView.deleteSelection(eraseChildren.value);
 		}
 	}
@@ -428,7 +428,7 @@ var ScholarPane = new function()
 		var nsIFilePicker = Components.interfaces.nsIFilePicker;
 		var fp = Components.classes["@mozilla.org/filepicker;1"]
         					.createInstance(nsIFilePicker);
-		fp.init(window, "Select a File", nsIFilePicker.modeOpen);
+		fp.init(window, Scholar.getString('pane.item.files.select'), nsIFilePicker.modeOpen);
 		
 		if(fp.show() == nsIFilePicker.returnOK)
 		{
diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
index 8fff11f6b..f2082d8a6 100644
--- a/chrome/chromeFiles/content/scholar/overlay.xul
+++ b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -73,8 +73,8 @@
 					<spacer flex="1"/>
 					<toolbarbutton id="tb-collection-menu" type="menu">
 						<menupopup>
-							<menuitem label="Import..." oncommand="Scholar_File_Interface.importFile();"/>
-							<menuitem label="Export Library..." oncommand="Scholar_File_Interface.exportFile();"/>
+							<menuitem label="&toolbar.import.label;" oncommand="Scholar_File_Interface.importFile();"/>
+							<menuitem label="&toolbar.export.label;" oncommand="Scholar_File_Interface.exportFile();"/>
 						</menupopup>
 					</toolbarbutton>
 				</toolbar>
@@ -100,15 +100,15 @@
 					<toolbarbutton id="tb-add" tooltiptext="&toolbar.newItem.label;" type="menu">
 						<menupopup/>
 					</toolbarbutton>
-					<toolbarbutton id="tb-file-add" type="menu" tooltiptext="New Standalone File">
+					<toolbarbutton id="tb-file-add" type="menu" tooltiptext="&toolbar.file.standalone;">
 						<menupopup>
-							<menuitem label="Add File..." oncommand="ScholarPane.addFileFromDialog();"/>
-							<menuitem label="Add Linked File..." oncommand="ScholarPane.addFileFromDialog(true);"/>
-							<menuitem label="Snapshot Current Page" oncommand="ScholarPane.addFileFromPage();"/>
-							<menuitem label="Link to Current Page" oncommand="ScholarPane.addFileFromPage(true);"/>
+							<menuitem label="&toolbar.file.add;" oncommand="ScholarPane.addFileFromDialog();"/>
+							<menuitem label="&toolbar.file.linked;" oncommand="ScholarPane.addFileFromDialog(true);"/>
+							<menuitem label="&toolbar.file.snapshot;" oncommand="ScholarPane.addFileFromPage();"/>
+							<menuitem label="&toolbar.file.weblink;" oncommand="ScholarPane.addFileFromPage(true);"/>
 						</menupopup>
 					</toolbarbutton>
-					<toolbarbutton id="tb-note-add" tooltiptext="New Standalone Note" oncommand="ScholarPane.newNote();"/>
+					<toolbarbutton id="tb-note-add" tooltiptext="&toolbar.note.standalone;" oncommand="ScholarPane.newNote();"/>
 					<spacer flex="1"/>
 					<label value="&toolbar.search.label;" control="tb-search"/>
 					<textbox id="tb-search" type="timed" timeout="250" command="cmd_scholar_search" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_scholar_search'); return false; }">
@@ -124,7 +124,7 @@
 					</hbox>
 					<spacer flex="1"/>
 					<toolbarbutton label="Save"/>
-					<toolbarbutton label="&scholar.plus;"/>
+					<toolbarbutton label="+"/>
 				</hbox>
 				<tree 
 					id="items-tree" context="scholar-itemmenu"
@@ -182,7 +182,7 @@
 			<splitter id="scholar-view-splitter" resizebefore="closest" resizeafter="closest"/>
 			<vbox>
 				<toolbar align="right">
-					<toolbarbutton id="tb-fullscreen" tooltiptext="Toggle Fullscreen Mode" oncommand="ScholarPane.fullScreen();"/>
+					<toolbarbutton id="tb-fullscreen" tooltiptext="&toolbar.fullscreen.tooltip;" oncommand="ScholarPane.fullScreen();"/>
 					<toolbarbutton class="tabs-closebutton" oncommand="ScholarPane.toggleDisplay()"/>
 				</toolbar>
 				<groupbox flex="1">
@@ -202,7 +202,7 @@
 						<deck id="scholar-view-item" flex="1"/>
 						<vbox id="scholar-view-note" flex="1">
 							<noteeditor id="scholar-note-editor" flex="1"/>
-							<button id="scholar-view-note-button" label="Edit in a separate window" oncommand="ScholarPane.openNoteWindow(this.getAttribute('noteID')); if(this.hasAttribute('sourceID')) ScholarPane.selectItem(this.getAttribute('sourceID'));"/>
+							<button id="scholar-view-note-button" label="&notes.separate;" oncommand="ScholarPane.openNoteWindow(this.getAttribute('noteID')); if(this.hasAttribute('sourceID')) ScholarPane.selectItem(this.getAttribute('sourceID'));"/>
 						</vbox>
 						<vbox id="scholar-view-file" flex="1">
 							<label id="scholar-file-label"/>
diff --git a/chrome/chromeFiles/locale/en-US/scholar/about.dtd b/chrome/chromeFiles/locale/en-US/scholar/about.dtd
new file mode 100644
index 000000000..a7940ced0
--- /dev/null
+++ b/chrome/chromeFiles/locale/en-US/scholar/about.dtd
@@ -0,0 +1,6 @@
+<!ENTITY scholar.name 			"Scholar">
+<!ENTITY scholar.version		"version 1.0a1">
+<!ENTITY scholar.createdby		"Created by:">
+<!ENTITY scholar.directors		"Directors:">
+<!ENTITY scholar.developers		"Developers:">
+<!ENTITY scholar.thanks			"Special thanks:">
\ No newline at end of file
diff --git a/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd b/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd
index 6bf81902d..d3f8e7a46 100644
--- a/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd
+++ b/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd
@@ -5,9 +5,7 @@
 <!ENTITY tabs.files.label				"Files">
 <!ENTITY tabs.tags.label				"Tags">
 <!ENTITY tabs.related.label				"Related">
-
-<!ENTITY scholar.minus					"-">
-<!ENTITY scholar.plus					"+">
+<!ENTITY notes.separate					"Edit in a separate window">
 
 <!ENTITY items.type_column 				"Type">
 <!ENTITY items.title_column 			"Title">
@@ -26,8 +24,20 @@
 <!ENTITY toolbar.renameCollection.label   "Rename Project...">
 <!ENTITY toolbar.removeCollection.label   "Remove Project...">
 <!ENTITY toolbar.exportCollection.label   "Export Project...">
+<!ENTITY toolbar.import.label			"Import...">
+<!ENTITY toolbar.export.label			"Export Library...">
 <!ENTITY toolbar.createBibCollection.label   "Create Bibliography From Project...">
 <!ENTITY toolbar.search.label   			"Search:">
+<!ENTITY toolbar.fullscreen.tooltip		"Toggle Fullscreen Mode">
+
+<!ENTITY item.add						"Add">
+
+<!ENTITY toolbar.note.standalone		"New Standalone Note">
+<!ENTITY toolbar.file.standalone		"New Standalone File">
+<!ENTITY toolbar.file.add   			"Add File...">
+<!ENTITY toolbar.file.linked   			"Add Linked File...">
+<!ENTITY toolbar.file.snapshot 			"Snapshot Current Page">
+<!ENTITY toolbar.file.weblink  			"Link to Current Page">
 
 <!ENTITY selectitems.title   			"Select Items">
 <!ENTITY selectitems.intro.label   		"Select which items you'd like to add to your library">
diff --git a/chrome/chromeFiles/locale/en-US/scholar/scholar.properties b/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
index b34501ad7..146718e45 100644
--- a/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
+++ b/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
@@ -6,6 +6,8 @@ pane.collections.untitled		= Untitled Project
 
 pane.items.delete				= Are you sure you want to delete the selected item?
 pane.items.delete.multiple		= Are you sure you want to delete the selected items?
+pane.items.delete.title			= Delete
+pane.items.delete.attached		= Erase attached notes and files
 pane.items.menu.remove			= Remove Selected Item...
 pane.items.menu.remove.multiple	= Remove Selected Items...
 pane.items.menu.export			= Export Selected Item...
@@ -24,6 +26,7 @@ pane.item.notes.count.plural    = %1 notes
 pane.item.files.delete.confirm  = Are you sure you want to delete this file?
 pane.item.files.count.singular  = %1 file
 pane.item.files.count.plural    = %1 files
+pane.item.files.select			= Select a File
 
 itemFields.title        		= Title
 itemFields.dateAdded    		= Date Added