diff --git a/mailnews/base/resources/locale/en-US/folderpane.dtd b/mailnews/base/resources/locale/en-US/folderpane.dtd
index c64cc160d28..19633975fe4 100644
--- a/mailnews/base/resources/locale/en-US/folderpane.dtd
+++ b/mailnews/base/resources/locale/en-US/folderpane.dtd
@@ -21,5 +21,5 @@ Rights Reserved.
 <!ENTITY unreadColumn.label "Unread"> 
 <!ENTITY totalColumn.label "Total"> 
 <!ENTITY accounts.label "Accounts">
-<!-- LOCALIZATION NOTE (accounts.img) : do not translate below line -->
+<!-- LOCALIZATION NOTE (accounts.img) : DONT_TRANSLATE -->
 <!ENTITY accounts.img "chrome://messenger/skin/local-mailhost.gif">
diff --git a/mailnews/base/resources/locale/en-US/messenger.dtd b/mailnews/base/resources/locale/en-US/messenger.dtd
index ae3ff59e553..d5560d7f805 100644
--- a/mailnews/base/resources/locale/en-US/messenger.dtd
+++ b/mailnews/base/resources/locale/en-US/messenger.dtd
@@ -26,33 +26,24 @@ Rights Reserved.
 
 <!-- File menu items -->
 <!ENTITY newMessage.label				"New Message">  
-<!-- LOCALIZATION NOTE newMessage.accesskey		: DONT_TRANSLATE -->
 <!ENTITY newMessage.accesskey			"n">  
 <!ENTITY newFolderCmd.label				"Folder...">  
-<!-- LOCALIZATION NOTE newFolderCmd.accesskey		: DONT_TRANSLATE -->  
 <!ENTITY newFolderCmd.accesskey			"f">  
 <!ENTITY newAccountCmd.label			"Account...">  
-<!-- LOCALIZATION NOTE newAccountCmd.accesskey		: DONT_TRANSLATE -->  
 <!ENTITY newAccountCmd.accesskey		"a">  
 <!ENTITY openAttachmentCmd.label		".Open Attachment">  
 <!ENTITY saveAsMenu.label				"Save As"> 
-<!-- LOCALIZATION NOTE saveAsMenu.accesskey			: DONT_TRANSLATE --> 
 <!ENTITY saveAsMenu.accesskey			"s"> 
 <!ENTITY saveAsFileCmd.label			"File">  
-<!-- LOCALIZATION NOTE saveAsFileCmd.accesskey		: DONT_TRANSLATE -->  
 <!ENTITY saveAsFileCmd.accesskey		"f">  
 <!ENTITY saveAsTemplateCmd.label		"Template">  
-<!-- LOCALIZATION NOTE saveAsTemplateCmd.accesskey	: DONT_TRANSLATE -->  
 <!ENTITY saveAsTemplateCmd.accesskey	"t">  
 <!ENTITY getNewMsgCmd.label				"Get New Messages">  
-<!-- LOCALIZATION NOTE getNewMsgCmd.accesskey			: DONT_TRANSLATE -->  
 <!ENTITY getNewMsgCmd.accesskey			"m">  
 <!ENTITY sendUnsentCmd.label			"Send Unsent Messages">  
-<!-- LOCALIZATION NOTE sendUnsentCmd.accesskey		: DONT_TRANSLATE -->  
 <!ENTITY sendUnsentCmd.accesskey		"d">  
 <!ENTITY loadFirstDraft.label			"Load First Draft Message">
 <!ENTITY subscribeCmd.label				"Subscribe...">  
-<!-- LOCALIZATION NOTE subscribeCmd.accesskey			: DONT_TRANSLATE -->  
 <!ENTITY subscribeCmd.accesskey			"b">  
 <!ENTITY renameFolder.label				"Rename Folder...">
 <!ENTITY renameFolder.accesskey			"r">
@@ -93,10 +84,9 @@ Rights Reserved.
 <!ENTITY redoDefaultCmd.label "Redo">
 
 <!-- View Menu -->
-<!-- LOCALIZATION NOTE (showSidebarMenu) : Do not translate below line. -->
+<!-- LOCALIZATION NOTE (showSidebarMenu) : Do not translate line. -->
 <!ENTITY showSidebarMenu.label				".SideBar">
 <!ENTITY showMessengerToolbarCmd.label		"Mail Toolbar">
-<!-- LOCALIZATION NOTE showMessengerToolbarCmd.accesskey	: DONT_TRANSLATE -->
 <!ENTITY showMessengerToolbarCmd.accesskey	"o">
 <!ENTITY showLocationToolbarCmd.label		".Location Toolbar">
 <!ENTITY showLocationToolbarCmd.accesskey	"l">
diff --git a/mailnews/base/resources/locale/en-US/messenger.properties b/mailnews/base/resources/locale/en-US/messenger.properties
index 44f1690c2c8..b9ae80683b5 100644
--- a/mailnews/base/resources/locale/en-US/messenger.properties
+++ b/mailnews/base/resources/locale/en-US/messenger.properties
@@ -41,8 +41,11 @@ newsgroupProperties=Newsgroup Properties...
 folderProperties=Folder Properties...
 titleNewsPreHost=on
 titleMailPreHost=for
+# LOCALIZATION NOTES(HTMLFiles): Only translate "Files" in the line below
 HTMLFiles=HTML Files (*.htm, *.html, *.shtml)
+# LOCALIZATION NOTES(TextFiles): Do not translate "*.txt" in the line below
 TextFiles=Text Files (*.txt)
+# LOCALIZATION NOTES(TextFiles): Do not translate "*.eml" in the line below
 EMLFiles=Mail Files (*.eml)
 SaveMailAs=Save Message As
 LoadingMessageToPrint=Loading message to print...
@@ -58,10 +61,14 @@ verboseFolderFormat=%S on %S
 defaultServerTag=(Default)
 useDefaultServer=Use default server
 
+# LOCALIZATION NOTES(serverType-nntp): Do not translate "NNTP" in the line below
 serverType-nntp=Newsgroup server (NNTP)
+# LOCALIZATION NOTES(serverType-pop3): Do not translate "POP" in the line below
 serverType-pop3=POP Mail Server
+# LOCALIZATION NOTES(serverType-imap): Do not translate "IMAP" in the line below
 serverType-imap=IMAP Mail Server
 serverType-none=Local Mail Store
+# LOCALIZATION NOTES(serverType-movemail): DONT_TRANSLATE
 serverType-movemail=Unix Movemail
 
 recipientColumnHeader=Recipient
diff --git a/mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd b/mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd
index 459727fbdf9..13a4d8c4e20 100644
--- a/mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd
+++ b/mailnews/base/resources/locale/en-US/msgHdrViewOverlay.dtd
@@ -21,6 +21,7 @@ Rights Reserved.
 <!ENTITY toField.label "To: ">
 <!ENTITY fromField.label "From: ">
 <!ENTITY subjectField.label "Subject: ">
+<!--# LOCALIZATION NOTE (ccField.label): DONT_TRANSLATE -->
 <!ENTITY ccField.label "Cc: ">
 <!ENTITY newsgroupsField.label "Newsgroups: ">
 <!ENTITY dateField.label "Date: ">
diff --git a/mailnews/base/search/resources/locale/en-US/FilterEditor.dtd b/mailnews/base/search/resources/locale/en-US/FilterEditor.dtd
index c478f297cae..e20d47df37b 100644
--- a/mailnews/base/search/resources/locale/en-US/FilterEditor.dtd
+++ b/mailnews/base/search/resources/locale/en-US/FilterEditor.dtd
@@ -6,7 +6,9 @@
 <!ENTITY keyword.label "keyword">
 <!ENTITY age.label "age in days">
 <!ENTITY to.label "to">
+<!-- LOCALIZATION NOTE (cc.label): DONT_TRANSLATE -->
 <!ENTITY cc.label "CC">
+<!-- LOCALIZATION NOTE (toOrCc.label): Do not translate "CC" -->
 <!ENTITY toOrCc.label "to or CC">
 <!ENTITY status.label "status">
 <!ENTITY priority.label "priority">
diff --git a/mailnews/base/search/resources/locale/en-US/SearchOptions.dtd b/mailnews/base/search/resources/locale/en-US/SearchOptions.dtd
index 507f80a5019..e69de29bb2d 100644
--- a/mailnews/base/search/resources/locale/en-US/SearchOptions.dtd
+++ b/mailnews/base/search/resources/locale/en-US/SearchOptions.dtd
@@ -1,9 +0,0 @@
-<!-- extracted from SearchOptions.xul -->
-
-<!ENTITY searchOptionsTitle.label "Search Options">
-<!ENTITY searchSubfoldersCheckbox.label "Search Subfolders">
-<!ENTITY localRemoteTitle.label "When online, search for messages:">
-<!ENTITY localSearchRadio.label "on your local system">
-<!ENTITY removeSearchRadio.label "on the specified serer">
-<!ENTITY ok.label "OK">
-<!ENTITY cancel.label "Cancel">
diff --git a/mailnews/base/search/resources/locale/en-US/search-attributes.properties b/mailnews/base/search/resources/locale/en-US/search-attributes.properties
index 24c387a83de..d4dcd90c9c1 100644
--- a/mailnews/base/search/resources/locale/en-US/search-attributes.properties
+++ b/mailnews/base/search/resources/locale/en-US/search-attributes.properties
@@ -1,3 +1,6 @@
+# LOCALIZATION NOTE FILE: Translate only items 0 to 10
+# Other items may be used in version 6.1 or later
+
 0=Subject
 1=Sender
 2=Body