diff --git a/chrome/content/zotero/about.xul b/chrome/content/zotero/about.xul
index c802173be..4b1e64857 100644
--- a/chrome/content/zotero/about.xul
+++ b/chrome/content/zotero/about.xul
@@ -28,7 +28,7 @@
 	<script src="include.js"/>
 	
 	<vbox id="aboutcontent">
-		<label id="name" value="&zotero.name;"/>
+		<label id="name" value="Zotero"/>
 		<label class="text-link" href="http://www.zotero.org" value="http://www.zotero.org"/>
 		<label id="version" value="&zotero.version; "/>
 		<script>
diff --git a/chrome/content/zotero/bindings/relatedbox.xml b/chrome/content/zotero/bindings/relatedbox.xml
index a55bb518e..f1d91adc4 100644
--- a/chrome/content/zotero/bindings/relatedbox.xml
+++ b/chrome/content/zotero/bindings/relatedbox.xml
@@ -21,6 +21,8 @@
     ***** END LICENSE BLOCK *****
 -->
 
+<!DOCTYPE bindings SYSTEM "chrome://zotero/locale/zotero.dtd">
+
 <bindings 	xmlns="http://www.mozilla.org/xbl"
 			xmlns:xbl="http://www.mozilla.org/xbl"
 			xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -211,7 +213,19 @@
 								count = 0;
 						}
 						
-						this.id('seeAlsoNum').value = count + ' related:';
+						var str = 'pane.item.related.count.';
+						switch (count){
+							case 0:
+								str += 'zero';
+								break;
+							case 1:
+								str += 'singular';
+								break;
+							default:
+								str += 'plural';
+								break;
+						}
+						this.id('seeAlsoNum').value = Zotero.getString(str, [count]);
 					]]>
 				</body>
 			</method>
@@ -228,7 +242,7 @@
 			<xul:vbox xbl:inherits="flex">
 				<xul:hbox align="center">
 					<xul:label id="seeAlsoNum"/>
-					<xul:button label="Add" oncommand="this.parentNode.parentNode.parentNode.add();"/>
+					<xul:button label="&zotero.item.add;" oncommand="this.parentNode.parentNode.parentNode.add();"/>
 				</xul:hbox>
 				<xul:grid flex="1">
 					<xul:columns>
diff --git a/chrome/content/zotero/bindings/tagsbox.xml b/chrome/content/zotero/bindings/tagsbox.xml
index b1f5a2e6c..e6006a5f9 100644
--- a/chrome/content/zotero/bindings/tagsbox.xml
+++ b/chrome/content/zotero/bindings/tagsbox.xml
@@ -21,6 +21,8 @@
     ***** END LICENSE BLOCK *****
 -->
 
+<!DOCTYPE bindings SYSTEM "chrome://zotero/locale/zotero.dtd">
+
 <bindings 	xmlns="http://www.mozilla.org/xbl"
 			xmlns:xbl="http://www.mozilla.org/xbl"
 			xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -200,8 +202,20 @@
 								count = 0;
 						}
 						
-						this.id('tagsNum').value =
-							Zotero.getString('pane.item.tags.count.' + (count != 1 ? "plural" : "singular"), [count]) + ":";
+						var str = 'pane.item.tags.count.';
+						switch (count){
+							case 0:
+								str += 'zero';
+								break;
+							case 1:
+								str += 'singular';
+								break;
+							default:
+								str += 'plural';
+								break;
+						}
+						
+						this.id('tagsNum').value = Zotero.getString(str, [count]);
 						this.count = count;
 					]]>
 				</body>
@@ -238,7 +252,7 @@
 			<xul:vbox xbl:inherits="flex">
 				<xul:hbox align="center">
 					<xul:label id="tagsNum"/>
-					<xul:button label="Add" oncommand="this.parentNode.parentNode.parentNode.new();"/>
+					<xul:button label="&zotero.item.add;" oncommand="this.parentNode.parentNode.parentNode.new();"/>
 				</xul:hbox>
 				<xul:grid>
 					<xul:columns>
diff --git a/chrome/content/zotero/itemPane.js b/chrome/content/zotero/itemPane.js
index 328adc485..4631317af 100644
--- a/chrome/content/zotero/itemPane.js
+++ b/chrome/content/zotero/itemPane.js
@@ -1244,14 +1244,40 @@ var ZoteroItemPane = new function()
 	{
 		var c = _notesList.childNodes.length;
 		
-		_notesLabel.value = Zotero.getString('pane.item.notes.count.'+(c != 1 ? "plural" : "singular"), [c]) + ":";
+		var str = 'pane.item.notes.count.';
+		switch (c){
+			case 0:
+				str += 'zero';
+				break;
+			case 1:
+				str += 'singular';
+				break;
+			default:
+				str += 'plural';
+				break;
+		}
+		
+		_notesLabel.value = Zotero.getString(str, [c]);
 	}
 	
 	function _updateAttachmentCount()
 	{
 		var c = _attachmentsList.childNodes.length;
 		
-		_attachmentsLabel.value = Zotero.getString('pane.item.attachments.count.'+(c != 1 ? "plural" : "singular"), [c]) + ":";
+		var str = 'pane.item.attachments.count.';
+		switch (c){
+			case 0:
+				str += 'zero';
+				break;
+			case 1:
+				str += 'singular';
+				break;
+			default:
+				str += 'plural';
+				break;
+		}
+		
+		_attachmentsLabel.value = Zotero.getString(str, [c]);
 	}
 	
 	function removeAttachment(id)
diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 81da4cd09..7945610fe 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -112,6 +112,7 @@ var ZoteroPane = new function()
 			var menuitem = document.createElement("menuitem");
 			menuitem.setAttribute("label", Zotero.getString("itemTypes."+itemTypes[i]['name']));
 			menuitem.setAttribute("oncommand","ZoteroPane.newItem("+itemTypes[i]['id']+")");
+			menuitem.setAttribute("tooltiptext", "");
 			addMenu.insertBefore(menuitem, separator);
 		}
 		// Create submenu for secondary item types
@@ -121,6 +122,7 @@ var ZoteroPane = new function()
 			var menuitem = document.createElement("menuitem");
 			menuitem.setAttribute("label", Zotero.getString("itemTypes."+itemTypes[i]['name']));
 			menuitem.setAttribute("oncommand","ZoteroPane.newItem("+itemTypes[i]['id']+")");
+			menuitem.setAttribute("tooltiptext", "");
 			moreMenu.appendChild(menuitem);
 		}
 		
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index d9470b043..8804221ed 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -41,7 +41,7 @@
 	<toolbarpalette id="BrowserToolbarPalette">
 		<toolbarbutton id="scholar-toolbar-button"/> <!-- May be necessary to keep pre-1.0b2 installs from breaking -->
 		<toolbarbutton id="zotero-toolbar-button" class="toolbarbutton-1"
-						label="&zotero.name;"
+						label="Zotero"
 						oncommand="ZoteroPane.toggleDisplay();"/>
 	</toolbarpalette>
 	
@@ -256,7 +256,7 @@
 	<menupopup id="menu_ToolsPopup">
 		<menuseparator id="zoteroSeparator" insertbefore="devToolsSeparator"/>
 		<menuitem id="tools-zotero" insertbefore="devToolsSeparator"
-			oncommand="ZoteroPane.toggleDisplay();" label="&zotero.name;"
+			oncommand="ZoteroPane.toggleDisplay();" label="Zotero"
 			key="key_openZotero"/>
 	</menupopup>
   
diff --git a/chrome/content/zotero/preferences.xul b/chrome/content/zotero/preferences.xul
index 7553ace5c..e1bd47136 100644
--- a/chrome/content/zotero/preferences.xul
+++ b/chrome/content/zotero/preferences.xul
@@ -32,7 +32,7 @@
 <script src="preferences.js"/>
 <script src="include.js"/>
 
-<dialogheader id="header" title="&zotero.name;" description="&zotero.preferences.title;"/>
+<dialogheader id="header" title="Zotero" description="&zotero.preferences.title;"/>
 
 <hbox align="center">
 	<label value="&zotero.preferences.position.label;" control="positionMenu"/>
diff --git a/chrome/locale/de-DE/zotero/about.dtd b/chrome/locale/de-DE/zotero/about.dtd
index 6362f8382..f4fca8ce5 100644
--- a/chrome/locale/de-DE/zotero/about.dtd
+++ b/chrome/locale/de-DE/zotero/about.dtd
@@ -1,4 +1,3 @@
-<!ENTITY zotero.name "Zotero">
 <!ENTITY zotero.version "Version">
 <!ENTITY zotero.createdby "Geschaffen von:">
 <!ENTITY zotero.directors "Direktoren:">
diff --git a/chrome/locale/de-DE/zotero/preferences.dtd b/chrome/locale/de-DE/zotero/preferences.dtd
index bdf0d214c..e9a379f61 100644
--- a/chrome/locale/de-DE/zotero/preferences.dtd
+++ b/chrome/locale/de-DE/zotero/preferences.dtd
@@ -1,4 +1,3 @@
-<!ENTITY zotero.name "Zotero">
 <!ENTITY zotero.preferences.title "Zotero Einstellungen">
 <!ENTITY zotero.preferences.autoUpdate.label "Automatisch nach aktualisierten Scrapers checken">
 <!ENTITY zotero.preferences.reportTranslationFailure.label "Von nicht funktionierenden Übersetzern berichten">
diff --git a/chrome/locale/de-DE/zotero/zotero.dtd b/chrome/locale/de-DE/zotero/zotero.dtd
index 7acecddb9..78a168ab6 100644
--- a/chrome/locale/de-DE/zotero/zotero.dtd
+++ b/chrome/locale/de-DE/zotero/zotero.dtd
@@ -1,4 +1,3 @@
-<!ENTITY zotero.name "Zotero">
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "Ausgewählte zu Zotero Notiz hinzufügen">
 <!ENTITY zotero.contextMenu.addTextToNewNote "Zotero Notiz aus Ausgewählte machen">
 <!ENTITY zotero.tabs.info.label "Infos">
diff --git a/chrome/locale/de-DE/zotero/zotero.properties b/chrome/locale/de-DE/zotero/zotero.properties
index 06fefa3ee..b930aaa87 100644
--- a/chrome/locale/de-DE/zotero/zotero.properties
+++ b/chrome/locale/de-DE/zotero/zotero.properties
@@ -24,18 +24,18 @@ pane.item.defaultLastName=Name
 pane.item.defaultFullName=vollständiger Name
 pane.item.notes.untitled=Unbetitelte Notiz
 pane.item.notes.delete.confirm=Bist du sicher, dass du diese Notiz löschen möchtest?
-pane.item.notes.count.singular=%S Notiz
-pane.item.notes.count.plural=%S Notizen
+pane.item.notes.count.singular=%S Notiz:
+pane.item.notes.count.plural=%S Notizen:
 pane.item.attachments.view.link=Seite anschauen
 pane.item.attachments.view.snapshot=Schnappschuss anschauen
 pane.item.attachments.view.file=Datei anschauen
 pane.item.attachments.fileNotFound=Die angehängte Datei wurde nicht gefunden.\n\nDie hätte ausserhalb Zotero verschoben oder gelöscht werden können.
 pane.item.attachments.delete.confirm=Bist du sicher, dass du diesen Anhang löschen möchtest?
-pane.item.attachments.count.singular=%S Anhang
-pane.item.attachments.count.plural=%S Anhänge
+pane.item.attachments.count.singular=%S Anhang:
+pane.item.attachments.count.plural=%S Anhänge:
 pane.item.attachments.select=Datei auswählen
-pane.item.tags.count.singular=%S Tag
-pane.item.tags.count.plural=%S Tags
+pane.item.tags.count.singular=%S Tag:
+pane.item.tags.count.plural=%S Tags:
 itemTypes.note=Notiz
 itemTypes.attachment=Anhang
 itemTypes.book=Buch
diff --git a/chrome/locale/en-US/zotero/about.dtd b/chrome/locale/en-US/zotero/about.dtd
index d77c871a7..561aa967c 100644
--- a/chrome/locale/en-US/zotero/about.dtd
+++ b/chrome/locale/en-US/zotero/about.dtd
@@ -1,4 +1,3 @@
-<!ENTITY zotero.name 			"Zotero">
 <!ENTITY zotero.version		"version">
 <!ENTITY zotero.createdby		"Created by:">
 <!ENTITY zotero.directors		"Directors:">
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index a80b8e35e..505ad94e0 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -1,4 +1,3 @@
-<!ENTITY zotero.name					"Zotero">
 <!ENTITY zotero.preferences.title		"Zotero Preferences">
 <!ENTITY zotero.preferences.autoUpdate.label		"Automatically check for updated scrapers">
 <!ENTITY zotero.preferences.reportTranslationFailure.label	"Report broken site translators">
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 9c936c137..450300e3f 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -1,5 +1,3 @@
-<!ENTITY zotero.name									"Zotero">
-
 <!ENTITY zotero.contextMenu.addTextToCurrentNote		"Add Selection to Zotero Note">
 <!ENTITY zotero.contextMenu.addTextToNewNote			"Create Zotero Note from Selection">
 
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index cdd67254b..16273ffa7 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -27,18 +27,24 @@ pane.item.defaultLastName		= last
 pane.item.defaultFullName		= full name
 pane.item.notes.untitled        = Untitled Note
 pane.item.notes.delete.confirm  = Are you sure you want to delete this note?
-pane.item.notes.count.singular  = %S note
-pane.item.notes.count.plural    = %S notes
+pane.item.notes.count.zero      = %S notes:
+pane.item.notes.count.singular  = %S note:
+pane.item.notes.count.plural    = %S notes:
 pane.item.attachments.view.link	= View Page
 pane.item.attachments.view.snapshot	= View Snapshot
 pane.item.attachments.view.file	= View File
 pane.item.attachments.fileNotFound	= The attached file could not be found.\n\nIt may have been moved or deleted outside of Zotero.
 pane.item.attachments.delete.confirm  = Are you sure you want to delete this attachment?
-pane.item.attachments.count.singular  = %S attachment
-pane.item.attachments.count.plural    = %S attachments
+pane.item.attachments.count.zero      = %S attachments:
+pane.item.attachments.count.singular  = %S attachment:
+pane.item.attachments.count.plural    = %S attachments:
 pane.item.attachments.select			= Select a File
-pane.item.tags.count.singular   = %S tag
-pane.item.tags.count.plural     = %S tags
+pane.item.tags.count.zero       = %S tags:
+pane.item.tags.count.singular   = %S tag:
+pane.item.tags.count.plural     = %S tags:
+pane.item.related.count.zero    = %S related:
+pane.item.related.count.singular = %S related:
+pane.item.related.count.plural  = %S related:
 
 itemTypes.note					= Note
 itemTypes.attachment			= Attachment
diff --git a/chrome/locale/zh-CN/zotero/about.dtd b/chrome/locale/zh-CN/zotero/about.dtd
index fb868439f..3f69c2ae9 100644
--- a/chrome/locale/zh-CN/zotero/about.dtd
+++ b/chrome/locale/zh-CN/zotero/about.dtd
@@ -1,4 +1,3 @@
-<!ENTITY zotero.name "Zotero">
 <!ENTITY zotero.version "版本">
 <!ENTITY zotero.createdby "创建者:">
 <!ENTITY zotero.directors "Directors:">
diff --git a/chrome/locale/zh-CN/zotero/preferences.dtd b/chrome/locale/zh-CN/zotero/preferences.dtd
index 2e53449ea..4bbb2b646 100644
--- a/chrome/locale/zh-CN/zotero/preferences.dtd
+++ b/chrome/locale/zh-CN/zotero/preferences.dtd
@@ -1,4 +1,3 @@
-<!ENTITY zotero.name "Zotero">
 <!ENTITY zotero.preferences.title "Zotero 配置">
 <!ENTITY zotero.preferences.autoUpdate.label "自动检查更新">
 <!ENTITY zotero.preferences.reportTranslationFailure.label "报告无效的网站 translators">
diff --git a/chrome/locale/zh-CN/zotero/zotero.dtd b/chrome/locale/zh-CN/zotero/zotero.dtd
index e9139bacf..0f8839d0e 100644
--- a/chrome/locale/zh-CN/zotero/zotero.dtd
+++ b/chrome/locale/zh-CN/zotero/zotero.dtd
@@ -1,4 +1,3 @@
-<!ENTITY zotero.name "Zotero">
 <!ENTITY zotero.contextMenu.addTextToCurrentNote "添加所选内容至 Zotero 笔记">
 <!ENTITY zotero.contextMenu.addTextToNewNote "由所选内容创建 Zotero 笔记">
 <!ENTITY zotero.tabs.info.label "信息">
diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties
index e0f02badf..c4af5ea5c 100644
--- a/chrome/locale/zh-CN/zotero/zotero.properties
+++ b/chrome/locale/zh-CN/zotero/zotero.properties
@@ -24,18 +24,18 @@ pane.item.defaultLastName=last
 pane.item.defaultFullName=full name
 pane.item.notes.untitled=未命名笔记
 pane.item.notes.delete.confirm=确实要删除此笔记吗?
-pane.item.notes.count.singular=%S 条笔记
-pane.item.notes.count.plural=%S 条笔记
+pane.item.notes.count.singular=%S 条笔记:
+pane.item.notes.count.plural=%S 条笔记:
 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.singular=%S 个附件
-pane.item.attachments.count.plural=%S 个附件
+pane.item.attachments.count.singular=%S 个附件:
+pane.item.attachments.count.plural=%S 个附件:
 pane.item.attachments.select=选择文件
-pane.item.tags.count.singular=%S 个标签
-pane.item.tags.count.plural=%S 个标签
+pane.item.tags.count.singular=%S 个标签:
+pane.item.tags.count.plural=%S 个标签:
 itemTypes.note=笔记
 itemTypes.attachment=附件
 itemTypes.book=书籍