diff --git a/suite/debugQA/locales/en-US/pref-debug.dtd b/suite/debugQA/locales/en-US/pref-debug.dtd
index 9f72698890f..5b2000749cb 100644
--- a/suite/debugQA/locales/en-US/pref-debug.dtd
+++ b/suite/debugQA/locales/en-US/pref-debug.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/pref-debug.xul -->
 
-<!--LOCALIZATION NOTE pref-debug.dtd: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE : FILE DONT_TRANSLATE This file should not be translated -->
 <!ENTITY window.title "Debug">
 
 <!ENTITY lHeader "Debug">
diff --git a/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd b/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd
index e9d4826e11b..6311a2d9ba0 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd
@@ -1,12 +1,12 @@
 <!-- extracted from content/pref-advanced.xul -->
 
-<!--LOCALIZATION NOTE pref-advanced.dtd: 'Advanced' prefs settings -->
+<!--LOCALIZATION NOTE : FILE 'Advanced' prefs settings -->
 <!ENTITY window.title "Advanced">
 <!ENTITY lHeader "Advanced">
 <!ENTITY autoLoadImgCheck.label "Automatically load images"> 
-<!--LOCALIZATION NOTE enbJavaCheck.label: 'Java' should never be translated -->
+<!--LOCALIZATION NOTE (enbJavaCheck.label): 'Java' should never be translated -->
 <!ENTITY enbJavaCheck.label "Enable Java">
-<!--LOCALIZATION NOTE enbJsCheck.label: 'JavaScript' should never be translated -->
+<!--LOCALIZATION NOTE (enbJsCheck.label): 'JavaScript' should never be translated -->
 <!ENTITY enbJsCheck.label "Enable JavaScript">
 <!ENTITY enbJsCheck.labelforMailNNews "Enable JavaScript for Mail and News">
 <!ENTITY enbCssCheck.label "Enable style sheets">
@@ -19,6 +19,6 @@
 <!ENTITY remSignCheck.label "Automatically prefill usernames and passwords">
 <!ENTITY capFormsCheck.label "Enable prefilling of forms">
 <!ENTITY rHeader "Changing preferences that affect the entire product">
-<!--LOCALIZATION NOTE server.label: 'Wallet' is a product name and should not be translated. -->
+<!--LOCALIZATION NOTE (server.label): 'Wallet' is a product name and should not be translated. -->
 <!ENTITY server.label "Server for wallet tables">
 
diff --git a/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd b/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd
index 6b81e3bf362..3f8c88be062 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd
@@ -1,18 +1,18 @@
 <!-- extracted from content/pref-appearance.xul -->
 
-<!--LOCALIZATION NOTE pref-appearance.dtd: The Appearance prefs dialog.  -->
+<!--LOCALIZATION NOTE : FILE The Appearance prefs dialog.  -->
 <!ENTITY window.title "Appearance">
 <!ENTITY lHeader "Appearance">
 <!ENTITY rHeader "Change the appearance of the display">
 <!ENTITY onStartLegend.label "On startup, launch">
 <!ENTITY appear "Appearance">
-<!--LOCALIZATION NOTE navCheck.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (navCheck.label): DONT_TRANSLATE -->
 <!ENTITY navCheck.label "Navigator">
-<!--LOCALIZATION NOTE mesCheck.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (mesCheck.label): DONT_TRANSLATE -->
 <!ENTITY mesCheck.label "Messenger">
-<!--LOCALIZATION NOTE compCheck.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (compCheck.label): DONT_TRANSLATE -->
 <!ENTITY compCheck.label "Composer">
-<!--LOCALIZATION NOTE calCheck.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (calCheck.label): DONT_TRANSLATE -->
 <!ENTITY calCheck.label "Calendar">
 <!ENTITY showToolsLegend.label "Show toolbars as">
 <!ENTITY picsNtextRadio.label "Pictures and Text">
diff --git a/suite/locales/en-US/chrome/common/pref/pref-applications.dtd b/suite/locales/en-US/chrome/common/pref/pref-applications.dtd
index f8d9a325667..9b6714a4105 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-applications.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-applications.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/pref-applications.xul -->
 
-<!--LOCALIZATION NOTE pref-applications.dtd: The Applications prefs dialog -->
+<!--LOCALIZATION NOTE : FILE The Applications prefs dialog -->
 <!ENTITY window.title "Advanced">
 <!ENTITY lHeader "Applications">
 <!ENTITY rHeader "Specify helper applications for different file types">
@@ -11,6 +11,6 @@
 <!ENTITY removeButton.label "Remove">
 <!ENTITY file "File type details">
 <!ENTITY exten "Extension:">
-<!--LOCALIZATION NOTE mimeType: 'MIME' should not be translated -->
+<!--LOCALIZATION NOTE (mimeType): 'MIME' should not be translated -->
 <!ENTITY mimeType "MIME Type:">
 <!ENTITY handle "Handled By:">
diff --git a/suite/locales/en-US/chrome/common/pref/pref-cache.dtd b/suite/locales/en-US/chrome/common/pref/pref-cache.dtd
index a92ec389126..eb11448395d 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-cache.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-cache.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/pref-cache.xul -->
 
-<!--LOCALIZATION NOTE pref-cache.dtd: Cache prefs dialog -->
+<!--LOCALIZATION NOTE : FILE Cache prefs dialog -->
 <!ENTITY  title.label "Cache">
 <!ENTITY  lHeader "Cache">
 <!ENTITY  rHeader "Designate the size of the cache">
diff --git a/suite/locales/en-US/chrome/common/pref/pref-colors.dtd b/suite/locales/en-US/chrome/common/pref/pref-colors.dtd
index 8a8cad20b25..199deeb0351 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-colors.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-colors.dtd
@@ -1,12 +1,12 @@
 <!-- extracted from content/pref-colors.xul -->
 
-<!--LOCALIZATION NOTE pref-colors.dtd: Color management prefs -->
+<!--LOCALIZATION NOTE : FILE Color management prefs -->
 <!ENTITY  window.title "Colors">
 <!ENTITY  lHeader "Colors">
 <!ENTITY  rHeader "Change the colors in your display">
 <!ENTITY  color "Colors">
 <!ENTITY  text "Text:">
-<!--LOCALIZATION NOTE colorPick: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (colorPick): DONT_TRANSLATE -->
 <!ENTITY  colorPick "Color Picker">
 <!ENTITY  background "Background:">
 <!ENTITY  useWinColorsCheck.label "Use Windows colors">
diff --git a/suite/locales/en-US/chrome/common/pref/pref-debug.dtd b/suite/locales/en-US/chrome/common/pref/pref-debug.dtd
index 9f72698890f..5b2000749cb 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-debug.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-debug.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/pref-debug.xul -->
 
-<!--LOCALIZATION NOTE pref-debug.dtd: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE : FILE DONT_TRANSLATE This file should not be translated -->
 <!ENTITY window.title "Debug">
 
 <!ENTITY lHeader "Debug">
diff --git a/suite/locales/en-US/chrome/common/pref/pref-download.dtd b/suite/locales/en-US/chrome/common/pref/pref-download.dtd
index 9262446d409..766d7c0c763 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-download.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-download.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/pref-download.xul -->
 
-<!--LOCALIZATION NOTE pref-download.dtd: 'Download' prefs dialog. Handles optins for reading mail/news offline -->
+<!--LOCALIZATION NOTE : FILE 'Download' prefs dialog. Handles optins for reading mail/news offline -->
 <!ENTITY  title.label "Download">
 <!ENTITY  lHeader "Download">
 <!ENTITY  rHeader "Choose settings for sending messages offline">
diff --git a/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd b/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
index aa2b4ae2f49..a1652fb75ff 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
@@ -1,23 +1,23 @@
 <!-- extracted from content/pref-fonts.xul -->
 
-<!--LOCALIZATION NOTE pref-fonts.dtd: 'Fonts' prefs dialog -->
+<!--LOCALIZATION NOTE : FILE 'Fonts' prefs dialog -->
 <!ENTITY  window.title "Fonts">
 <!ENTITY  lHeader "Fonts">
 <!ENTITY  rHeader "Change the fonts in your display">
 <!ENTITY  encod.select "For the Encoding:">
 <!ENTITY  encod1.option "Western">
 <!ENTITY  size.select "Size">
-<!--LOCALIZATION NOTE size1.option: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (size1.option): DONT_TRANSLATE -->
 <!ENTITY  size1.option "10">
 <!ENTITY  varFont.select "Variable Width Font:">
-<!--LOCALIZATION NOTE varFont.option: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (varFont.option): DONT_TRANSLATE -->
 <!ENTITY  varFont.option "10">
 <!ENTITY  fixedFont.Select "Fixed Width Font">
-<!--LOCALIZATION NOTE fixedFont.option Don't translate this term. -->
+<!--LOCALIZATION NOTE (fixedFont.option): DONT_TRANSLATE -->
 <!ENTITY  fixedFont.option "Filler">
 <!ENTITY  header2 "Sometimes a document will provide its own fonts.">
 <!ENTITY  useDefaultFont "Use my default fonts, overriding document-specified fonts">
-<!--LOCALIZATION NOTE useDocFontNonDynamic Translate 'Dynamic Fonts' according to Netscape Glossary -->
+<!--LOCALIZATION NOTE (useDocFontNonDynamic): Translate 'Dynamic Fonts' according to Netscape Glossary -->
 <!ENTITY  useDocFontNonDynamic "Use document-specified fonts, but disable Dynamic Fonts">
-<!--LOCALIZATION NOTE useDocFontDynamic Translate 'Dynamic Fonts' according to Netscape Glossary -->
+<!--LOCALIZATION NOTE (useDocFontDynamic): Translate 'Dynamic Fonts' according to Netscape Glossary -->
 <!ENTITY  useDocFontDynamic "Use document-specified fonts, including Dynamic Fonts">
diff --git a/suite/locales/en-US/chrome/common/pref/pref-languages.dtd b/suite/locales/en-US/chrome/common/pref/pref-languages.dtd
index 0f269031fd4..56d2493f8dc 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-languages.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-languages.dtd
@@ -1,13 +1,13 @@
 <!-- extracted from content/pref-languages.xul -->
 
-<!--LOCALIZATION NOTE pref-languages.dtd: 'Languages' preferences dialog -->
+<!--LOCALIZATION NOTE : FILE 'Languages' preferences dialog -->
 <!ENTITY  window.title "Languages">
 <!ENTITY  LangHeader "Languages">
 <!ENTITY  prefLangDecript "Choose in order of preference the language(s) 
 			in which you prefer to view web pages. Web pages are sometimes 
 			available in several languages.  Naveigator presents pages in 
 			the available language you most prefer.">
-<!--LOCALIZATION NOTE engOption.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (engOption.label): DONT_TRANSLATE -->
 <!ENTITY engOption.label  "English">
 <!ENTITY addButton.label  "Add...">
 <!ENTITY deleteButton.label  "Delete...">
diff --git a/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd b/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd
index c94a59df135..ea1dc7569dd 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd
@@ -1,7 +1,7 @@
 <!-- extracted from content/pref-navigator.xul -->
 
-<!--LOCALIZATION NOTE pref-navigator.dtd: Navigator prefs screen -->
-<!--LOCALIZATION NOTE title.label: Never translate the term "Navigator" -->
+<!--LOCALIZATION NOTE : FILE Navigator prefs screen -->
+<!--LOCALIZATION NOTE (title.label): DONT_TRANSLATE -->
 <!ENTITY  title.label "Navigator">
 <!ENTITY  lHeader "Navigator">
 <!ENTITY  rHeader "Specify the home page location">
@@ -16,7 +16,7 @@
 <!ENTITY  browseFile "Select File...">
 <!ENTITY  header3.label "History">
 <!ENTITY  historyPages "List of the pages you have previously visited.">
-<!--LOCALIZATION NOTE histDay: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (histDay): DONT_TRANSLATE -->
 <!ENTITY  histDay "9">
 <!ENTITY  daysRadio "days">
 <!ENTITY  homepageRadio "Homepage">
diff --git a/suite/locales/en-US/chrome/common/pref/pref-offline.dtd b/suite/locales/en-US/chrome/common/pref/pref-offline.dtd
index 351a830ceb4..fe5c4f82a6f 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-offline.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-offline.dtd
@@ -1,19 +1,22 @@
 <!-- extracted from content/pref-offline.xul -->
 
-<!--LOCALIZATION NOTE pref-offline.dtd: The 'Offline' preferences dialog -->
+<!--LOCALIZATION NOTE : FILE The 'Offline' preferences dialog -->
 <!ENTITY title.label "Offline">
 <!ENTITY header "Offline">
 <!ENTITY header1 "Startup State">
-<!--LOCALIZATION NOTE descipt1: Never translate the term 'Communicator' -->
+<!--LOCALIZATION NOTE (descipt1): Never translate the term 'Communicator' -->
 <!ENTITY descipt1 "Commucator can start in either online or offline modes. When online you have full 
 access to your network.  When offline you can only read messages that you have previously downloaded.">
 <!ENTITY prevRadio.label "Remember Previous State">
+<!--LOCALIZATION NOTE (communRemember): Never translate the term 'Communicator' -->
 <!ENTITY communRemember "Communicator will remember the state it was in last and start in that mode.">
 <!ENTITY askOfflineRadio.label "Ask Me">
+<!--LOCALIZATION NOTE (offlineStartAskEach): Never translate the term 'Communicator' -->
 <!ENTITY offlineStartAskEach "Communicator will ask you each time you start the program.">
 <!ENTITY heaeder2 "When Going Online">
 <!ENTITY unsentAskRadio.label "Ask me if I want to send my unsent messages">
 <!ENTITY unsentAutoRadio.label "Automatically send my unsent messages">
 <!ENTITY unsentDoNotRadio.label "Do not send my unsent messages">
+<!--LOCALIZATION NOTE (header3): Never translate the term 'Communicator' -->
 <!ENTITY header3 "When Exiting Communicator">
 <!ENTITY promptSynchCheck.label "Prompt me to synchronize my messages">
diff --git a/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd b/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd
index eddd9fd5c10..11eef5e33ac 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/pref-proxies.xul -->
 
-<!--LOCALIZATION NOTE pref-proxies.dtd: The Proxies preferences dialog -->
+<!--LOCALIZATION NOTE : FILE The Proxies preferences dialog -->
 <!ENTITY  title.label "Sample Prefs Panel">
 <!ENTITY  lHeader  "Proxies">
 <!ENTITY  rHeader  "Configure proxies to access the Internet">
diff --git a/suite/locales/en-US/chrome/common/pref/pref-smart_browsing.dtd b/suite/locales/en-US/chrome/common/pref/pref-smart_browsing.dtd
index 07591459474..292c0a8a03f 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-smart_browsing.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-smart_browsing.dtd
@@ -1,23 +1,23 @@
 <!-- extracted from content/pref-smart_browsing.xul -->
 
-<!--LOCALIZATION NOTE pref-smart_browsing.dtd: The SmartBrowsing prefs dialog -->
-<!--LOCALIZATION NOTE title.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE : FILE The SmartBrowsing prefs dialog -->
+<!--LOCALIZATION NOTE (title.label): DONT_TRANSLATE -->
 <!ENTITY  title.label "Smart Browsing">
 
-<!--LOCALIZATION NOTE lHeader: Translate "What's Related" according to Netscape glossary -->
+<!--LOCALIZATION NOTE (lHeader): Translate "What's Related" according to Netscape glossary -->
 <!ENTITY  lHeader "What's Related">
 <!ENTITY  rHeader "Configure browsing aids">
-<!--LOCALIZATION NOTE enableRelatedRadio.label: Translate "What's Related" according to Netscape glossary -->
+<!--LOCALIZATION NOTE (enableRelatedRadio.label): Translate "What's Related" according to Netscape glossary -->
 <!ENTITY  enableRelatedRadio.label "Enable 'What's Related'">
-<!--LOCALIZATION NOTE autoDecp.label: Translate "What's Related" according to Netscape glossary -->
+<!--LOCALIZATION NOTE (autoDecp.label): Translate "What's Related" according to Netscape glossary -->
 <!ENTITY  autoDecp.label "Automatically load 'Whats Related' information">
 <!ENTITY  neverRadio "Never">
 <!ENTITY  afterAutoloadFirstRadio "After first use">
 <!ENTITY  afterAutoloadAlwaysRadio "Always">
-<!--LOCALIZATION NOTE doNotDecp.label: Translate "What's Related" according to Netscape glossary -->
+<!--LOCALIZATION NOTE (doNotDecp.label): Translate "What's Related" according to Netscape glossary -->
 <!ENTITY  doNotDecp.label "Do not request What's Related information for the following domains  (a comma-separated list)">
-<!--LOCALIZATION NOTE internetKeywordsHeader.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (internetKeywordsHeader.label): DONT_TRANSLATE -->
 <!ENTITY  internetKeywordsHeader.label "Internet Keywords">
-<!--LOCALIZATION NOTE enableKeyCheck.label: Do not translate 'Internet Keywords' -->
+<!--LOCALIZATION NOTE (enableKeyCheck.label): Do not translate 'Internet Keywords' -->
 <!ENTITY  enableKeyCheck.label "Enable Internet Keywords">
 
diff --git a/suite/locales/en-US/chrome/common/pref/pref-smartupdate.dtd b/suite/locales/en-US/chrome/common/pref/pref-smartupdate.dtd
index 3184c879949..c7f4b9e1e43 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-smartupdate.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-smartupdate.dtd
@@ -1,9 +1,9 @@
-<!--LOCALIZATION NOTE pref-smartupdate.dtd: UI for Software Updates prefs -->
+<!--LOCALIZATION NOTE : FILE UI for Software Updates prefs -->
 <!ENTITY title.label "Software Installation">
 <!ENTITY header "Software Installation">
 <!ENTITY enableSU.label "Enable software installations">
 <!ENTITY enableNotification.label "Enable notification of new and updated software">
 <!ENTITY requireConfirmation.label "Require manual confirmation of each install">
-<!--LOCALIZATION NOTE selectUninstall.label: A large list box appears below this label -->
+<!--LOCALIZATION NOTE (selectUninstall.label): A large list box appears below this label -->
 <!ENTITY selectUninstall.label "To uninstall, select from the following list and click the uninstall button">
 <!ENTITY uninstallButton.label "Uninstall">
diff --git a/suite/locales/en-US/chrome/common/pref/preftree.dtd b/suite/locales/en-US/chrome/common/pref/preftree.dtd
index 6f08c880524..b7fa7288531 100644
--- a/suite/locales/en-US/chrome/common/pref/preftree.dtd
+++ b/suite/locales/en-US/chrome/common/pref/preftree.dtd
@@ -1,14 +1,14 @@
 <!-- extracted from content/preftree.xul -->
 
-<!--LOCALIZATION NOTE preftree.dtd: Lists preferences categories that appear on the left of the preferences dialog -->
+<!--LOCALIZATION NOTE : FILE Lists preferences categories that appear on the left of the preferences dialog -->
 <!ENTITY appear.label "Appearance">
 <!ENTITY fonts.label "Fonts">
 <!ENTITY colors.label "Colors">
-<!--LOCALIZATION NOTE navigator.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (navigator.label): DONT_TRANSLATE -->
 <!ENTITY navigator.label "Navigator">
 <!ENTITY languages.label "Languages">
 <!ENTITY applications.label "Applications">
-<!--LOCALIZATION NOTE smartBrowse.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (smartBrowse.label): DONT_TRANSLATE -->
 <!ENTITY smartBrowse.label "Smart Browsing">
 <!ENTITY mail.label "Mail and Newsgroups">
 <!ENTITY address.label "Addressing">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/PrefsWindow.dtd b/xpfe/components/prefwindow/resources/locale/en-US/PrefsWindow.dtd
index 5d786932379..e69de29bb2d 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/PrefsWindow.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/PrefsWindow.dtd
@@ -1,5 +0,0 @@
-<!-- extracted from content/PrefsWindow.xul -->
-
-<!-- LOCALIZATION NOTE PrefsWindow.dtd: UI for the outer parts of the Prefs dialog -->
-<!ENTITY categoryHeader "Category">
-<!ENTITY window.title "Preferences">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
index e9d4826e11b..6311a2d9ba0 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
@@ -1,12 +1,12 @@
 <!-- extracted from content/pref-advanced.xul -->
 
-<!--LOCALIZATION NOTE pref-advanced.dtd: 'Advanced' prefs settings -->
+<!--LOCALIZATION NOTE : FILE 'Advanced' prefs settings -->
 <!ENTITY window.title "Advanced">
 <!ENTITY lHeader "Advanced">
 <!ENTITY autoLoadImgCheck.label "Automatically load images"> 
-<!--LOCALIZATION NOTE enbJavaCheck.label: 'Java' should never be translated -->
+<!--LOCALIZATION NOTE (enbJavaCheck.label): 'Java' should never be translated -->
 <!ENTITY enbJavaCheck.label "Enable Java">
-<!--LOCALIZATION NOTE enbJsCheck.label: 'JavaScript' should never be translated -->
+<!--LOCALIZATION NOTE (enbJsCheck.label): 'JavaScript' should never be translated -->
 <!ENTITY enbJsCheck.label "Enable JavaScript">
 <!ENTITY enbJsCheck.labelforMailNNews "Enable JavaScript for Mail and News">
 <!ENTITY enbCssCheck.label "Enable style sheets">
@@ -19,6 +19,6 @@
 <!ENTITY remSignCheck.label "Automatically prefill usernames and passwords">
 <!ENTITY capFormsCheck.label "Enable prefilling of forms">
 <!ENTITY rHeader "Changing preferences that affect the entire product">
-<!--LOCALIZATION NOTE server.label: 'Wallet' is a product name and should not be translated. -->
+<!--LOCALIZATION NOTE (server.label): 'Wallet' is a product name and should not be translated. -->
 <!ENTITY server.label "Server for wallet tables">
 
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
index 6b81e3bf362..3f8c88be062 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
@@ -1,18 +1,18 @@
 <!-- extracted from content/pref-appearance.xul -->
 
-<!--LOCALIZATION NOTE pref-appearance.dtd: The Appearance prefs dialog.  -->
+<!--LOCALIZATION NOTE : FILE The Appearance prefs dialog.  -->
 <!ENTITY window.title "Appearance">
 <!ENTITY lHeader "Appearance">
 <!ENTITY rHeader "Change the appearance of the display">
 <!ENTITY onStartLegend.label "On startup, launch">
 <!ENTITY appear "Appearance">
-<!--LOCALIZATION NOTE navCheck.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (navCheck.label): DONT_TRANSLATE -->
 <!ENTITY navCheck.label "Navigator">
-<!--LOCALIZATION NOTE mesCheck.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (mesCheck.label): DONT_TRANSLATE -->
 <!ENTITY mesCheck.label "Messenger">
-<!--LOCALIZATION NOTE compCheck.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (compCheck.label): DONT_TRANSLATE -->
 <!ENTITY compCheck.label "Composer">
-<!--LOCALIZATION NOTE calCheck.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (calCheck.label): DONT_TRANSLATE -->
 <!ENTITY calCheck.label "Calendar">
 <!ENTITY showToolsLegend.label "Show toolbars as">
 <!ENTITY picsNtextRadio.label "Pictures and Text">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd
index f8d9a325667..9b6714a4105 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/pref-applications.xul -->
 
-<!--LOCALIZATION NOTE pref-applications.dtd: The Applications prefs dialog -->
+<!--LOCALIZATION NOTE : FILE The Applications prefs dialog -->
 <!ENTITY window.title "Advanced">
 <!ENTITY lHeader "Applications">
 <!ENTITY rHeader "Specify helper applications for different file types">
@@ -11,6 +11,6 @@
 <!ENTITY removeButton.label "Remove">
 <!ENTITY file "File type details">
 <!ENTITY exten "Extension:">
-<!--LOCALIZATION NOTE mimeType: 'MIME' should not be translated -->
+<!--LOCALIZATION NOTE (mimeType): 'MIME' should not be translated -->
 <!ENTITY mimeType "MIME Type:">
 <!ENTITY handle "Handled By:">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
index a92ec389126..eb11448395d 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/pref-cache.xul -->
 
-<!--LOCALIZATION NOTE pref-cache.dtd: Cache prefs dialog -->
+<!--LOCALIZATION NOTE : FILE Cache prefs dialog -->
 <!ENTITY  title.label "Cache">
 <!ENTITY  lHeader "Cache">
 <!ENTITY  rHeader "Designate the size of the cache">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd
index 8a8cad20b25..199deeb0351 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd
@@ -1,12 +1,12 @@
 <!-- extracted from content/pref-colors.xul -->
 
-<!--LOCALIZATION NOTE pref-colors.dtd: Color management prefs -->
+<!--LOCALIZATION NOTE : FILE Color management prefs -->
 <!ENTITY  window.title "Colors">
 <!ENTITY  lHeader "Colors">
 <!ENTITY  rHeader "Change the colors in your display">
 <!ENTITY  color "Colors">
 <!ENTITY  text "Text:">
-<!--LOCALIZATION NOTE colorPick: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (colorPick): DONT_TRANSLATE -->
 <!ENTITY  colorPick "Color Picker">
 <!ENTITY  background "Background:">
 <!ENTITY  useWinColorsCheck.label "Use Windows colors">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd
index bdfc48fdb6e..b16afed5397 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd
@@ -1,15 +1,15 @@
 <!-- extracted from content/pref-composer.xul -->
 
-<!--LOCALIZATION NOTE pref-composer.dtd: 'Composer' prefs dialog. Similar to Communcator 4.x Document Properties/Colors and Background -->
+<!--LOCALIZATION NOTE : FILE 'Composer' prefs dialog. Similar to Communcator 4.x Document Properties/Colors and Background -->
 
-<!--LOCALIZATION NOTE title.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (title.label): DONT_TRANSLATE -->
 <!ENTITY  title.label "Composer">
 <!ENTITY  lHeader "Composer">
 <!ENTITY  rHeader "Set general preferences for authoring of Web pages">
 <!ENTITY  authorName "Author Name">
-<!--LOCALIZATION NOTE AutoSaveCheck.label Edit box appears between these two strings. Translators may need to alter the word order over the two strings according to locale. -->
+<!--LOCALIZATION NOTE (AutoSaveCheck.label): Edit box appears between these two strings. Translators may need to alter the word order over the two strings according to locale. -->
 <!ENTITY  AutoSaveCheck.label "Automatically save page every">
-<!--LOCALIZATION NOTE minText Edit box appears between these two strings. Translators may need to alter the word order over the two strings according to locale. -->
+<!--LOCALIZATION NOTE (minText): Edit box appears between these two strings. Translators may need to alter the word order over the two strings according to locale. -->
 <!ENTITY  minText "minutes">
 <!ENTITY  exterLegend.label "External Editors">
 <!ENTITY  htmlSource "HTML Source:">
@@ -23,5 +23,5 @@
 <!ENTITY  ActiveLinkText.label "Active Link Text">
 <!ENTITY  FollowedLinkText.label "Followed Link Text">
 <!ENTITY  BackgroundColor.label "Background">
-<!--LOCALIZATION NOTE colorPick: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (colorPick): DONT_TRANSLATE -->
 <!ENTITY  colorPick "ColorPicker">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-debug.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-debug.dtd
index 9f72698890f..5b2000749cb 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-debug.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-debug.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/pref-debug.xul -->
 
-<!--LOCALIZATION NOTE pref-debug.dtd: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE : FILE DONT_TRANSLATE This file should not be translated -->
 <!ENTITY window.title "Debug">
 
 <!ENTITY lHeader "Debug">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-download.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-download.dtd
index 9262446d409..766d7c0c763 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-download.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-download.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/pref-download.xul -->
 
-<!--LOCALIZATION NOTE pref-download.dtd: 'Download' prefs dialog. Handles optins for reading mail/news offline -->
+<!--LOCALIZATION NOTE : FILE 'Download' prefs dialog. Handles optins for reading mail/news offline -->
 <!ENTITY  title.label "Download">
 <!ENTITY  lHeader "Download">
 <!ENTITY  rHeader "Choose settings for sending messages offline">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
index aa2b4ae2f49..a1652fb75ff 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
@@ -1,23 +1,23 @@
 <!-- extracted from content/pref-fonts.xul -->
 
-<!--LOCALIZATION NOTE pref-fonts.dtd: 'Fonts' prefs dialog -->
+<!--LOCALIZATION NOTE : FILE 'Fonts' prefs dialog -->
 <!ENTITY  window.title "Fonts">
 <!ENTITY  lHeader "Fonts">
 <!ENTITY  rHeader "Change the fonts in your display">
 <!ENTITY  encod.select "For the Encoding:">
 <!ENTITY  encod1.option "Western">
 <!ENTITY  size.select "Size">
-<!--LOCALIZATION NOTE size1.option: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (size1.option): DONT_TRANSLATE -->
 <!ENTITY  size1.option "10">
 <!ENTITY  varFont.select "Variable Width Font:">
-<!--LOCALIZATION NOTE varFont.option: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (varFont.option): DONT_TRANSLATE -->
 <!ENTITY  varFont.option "10">
 <!ENTITY  fixedFont.Select "Fixed Width Font">
-<!--LOCALIZATION NOTE fixedFont.option Don't translate this term. -->
+<!--LOCALIZATION NOTE (fixedFont.option): DONT_TRANSLATE -->
 <!ENTITY  fixedFont.option "Filler">
 <!ENTITY  header2 "Sometimes a document will provide its own fonts.">
 <!ENTITY  useDefaultFont "Use my default fonts, overriding document-specified fonts">
-<!--LOCALIZATION NOTE useDocFontNonDynamic Translate 'Dynamic Fonts' according to Netscape Glossary -->
+<!--LOCALIZATION NOTE (useDocFontNonDynamic): Translate 'Dynamic Fonts' according to Netscape Glossary -->
 <!ENTITY  useDocFontNonDynamic "Use document-specified fonts, but disable Dynamic Fonts">
-<!--LOCALIZATION NOTE useDocFontDynamic Translate 'Dynamic Fonts' according to Netscape Glossary -->
+<!--LOCALIZATION NOTE (useDocFontDynamic): Translate 'Dynamic Fonts' according to Netscape Glossary -->
 <!ENTITY  useDocFontDynamic "Use document-specified fonts, including Dynamic Fonts">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-languages.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-languages.dtd
index 0f269031fd4..56d2493f8dc 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-languages.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-languages.dtd
@@ -1,13 +1,13 @@
 <!-- extracted from content/pref-languages.xul -->
 
-<!--LOCALIZATION NOTE pref-languages.dtd: 'Languages' preferences dialog -->
+<!--LOCALIZATION NOTE : FILE 'Languages' preferences dialog -->
 <!ENTITY  window.title "Languages">
 <!ENTITY  LangHeader "Languages">
 <!ENTITY  prefLangDecript "Choose in order of preference the language(s) 
 			in which you prefer to view web pages. Web pages are sometimes 
 			available in several languages.  Naveigator presents pages in 
 			the available language you most prefer.">
-<!--LOCALIZATION NOTE engOption.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (engOption.label): DONT_TRANSLATE -->
 <!ENTITY engOption.label  "English">
 <!ENTITY addButton.label  "Add...">
 <!ENTITY deleteButton.label  "Delete...">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
index c94a59df135..ea1dc7569dd 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
@@ -1,7 +1,7 @@
 <!-- extracted from content/pref-navigator.xul -->
 
-<!--LOCALIZATION NOTE pref-navigator.dtd: Navigator prefs screen -->
-<!--LOCALIZATION NOTE title.label: Never translate the term "Navigator" -->
+<!--LOCALIZATION NOTE : FILE Navigator prefs screen -->
+<!--LOCALIZATION NOTE (title.label): DONT_TRANSLATE -->
 <!ENTITY  title.label "Navigator">
 <!ENTITY  lHeader "Navigator">
 <!ENTITY  rHeader "Specify the home page location">
@@ -16,7 +16,7 @@
 <!ENTITY  browseFile "Select File...">
 <!ENTITY  header3.label "History">
 <!ENTITY  historyPages "List of the pages you have previously visited.">
-<!--LOCALIZATION NOTE histDay: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (histDay): DONT_TRANSLATE -->
 <!ENTITY  histDay "9">
 <!ENTITY  daysRadio "days">
 <!ENTITY  homepageRadio "Homepage">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd
index 351a830ceb4..fe5c4f82a6f 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd
@@ -1,19 +1,22 @@
 <!-- extracted from content/pref-offline.xul -->
 
-<!--LOCALIZATION NOTE pref-offline.dtd: The 'Offline' preferences dialog -->
+<!--LOCALIZATION NOTE : FILE The 'Offline' preferences dialog -->
 <!ENTITY title.label "Offline">
 <!ENTITY header "Offline">
 <!ENTITY header1 "Startup State">
-<!--LOCALIZATION NOTE descipt1: Never translate the term 'Communicator' -->
+<!--LOCALIZATION NOTE (descipt1): Never translate the term 'Communicator' -->
 <!ENTITY descipt1 "Commucator can start in either online or offline modes. When online you have full 
 access to your network.  When offline you can only read messages that you have previously downloaded.">
 <!ENTITY prevRadio.label "Remember Previous State">
+<!--LOCALIZATION NOTE (communRemember): Never translate the term 'Communicator' -->
 <!ENTITY communRemember "Communicator will remember the state it was in last and start in that mode.">
 <!ENTITY askOfflineRadio.label "Ask Me">
+<!--LOCALIZATION NOTE (offlineStartAskEach): Never translate the term 'Communicator' -->
 <!ENTITY offlineStartAskEach "Communicator will ask you each time you start the program.">
 <!ENTITY heaeder2 "When Going Online">
 <!ENTITY unsentAskRadio.label "Ask me if I want to send my unsent messages">
 <!ENTITY unsentAutoRadio.label "Automatically send my unsent messages">
 <!ENTITY unsentDoNotRadio.label "Do not send my unsent messages">
+<!--LOCALIZATION NOTE (header3): Never translate the term 'Communicator' -->
 <!ENTITY header3 "When Exiting Communicator">
 <!ENTITY promptSynchCheck.label "Prompt me to synchronize my messages">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd
index eddd9fd5c10..11eef5e33ac 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/pref-proxies.xul -->
 
-<!--LOCALIZATION NOTE pref-proxies.dtd: The Proxies preferences dialog -->
+<!--LOCALIZATION NOTE : FILE The Proxies preferences dialog -->
 <!ENTITY  title.label "Sample Prefs Panel">
 <!ENTITY  lHeader  "Proxies">
 <!ENTITY  rHeader  "Configure proxies to access the Internet">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-publish.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-publish.dtd
index b9551da284b..880ebeb3c1f 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-publish.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-publish.dtd
@@ -1,21 +1,21 @@
 <!-- extracted from content/pref-publish.xul -->
 
-<!--LOCALIZATION NOTE pref-publish.dtd: The Publish preferences screen -->
+<!--LOCALIZATION NOTE : FILE The Publish preferences screen -->
 <!ENTITY  window.title "Publish">
 <!ENTITY  composerHeader.label "Publish">
 <!ENTITY  maintainCheckbox.label "Maintain links">
 <!ENTITY  keepCheck.label "Keep images with page">
 
-<!--LOCALIZATION NOTE adjustDesc.label: Attempt to maitain approximate line length, linefeeds and white space -->
+<!--LOCALIZATION NOTE (adjustDesc.label): Attempt to maitain approximate line length, linefeeds and white space -->
 <!ENTITY  adjustDesc.label "Adjust links to work from the page's location. (Links to local pages will work when
 			      local versions exist.)           ">
-<!--LOCALIZATION NOTE saveDesc.label: Attempt to maitain approximate line length, linefeeds and white space -->
+<!--LOCALIZATION NOTE (saveDesc.label): Attempt to maitain approximate line length, linefeeds and white space -->
 <!ENTITY  saveDesc.label "Save copies of images to the page's location.  Images will always
 				appear in local versions of the page and when the page is published.">
 <!ENTITY  tip.label "Tip: Check both options if you will be using remote publishing.">
 <!ENTITY defaultHeader.label  "Default publishing location">
-<!--LOCALIZATION NOTE publishFtp.label: Edit box appears beside this label -->
+<!--LOCALIZATION NOTE (publishFtp.label): Edit box appears beside this label -->
 <!ENTITY  publishFtp.label "If publishing to a FTP site, enter the HTTP address to browse to:">
-<!--LOCALIZATION NOTE publishhtp.label: Edit box appears beside this label -->
+<!--LOCALIZATION NOTE (publishhtp.label): Edit box appears beside this label -->
 <!ENTITY  publishhtp.label "If publishing to a FTP site, enter the HTTP address to browse to:">
 
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
index 07591459474..292c0a8a03f 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
@@ -1,23 +1,23 @@
 <!-- extracted from content/pref-smart_browsing.xul -->
 
-<!--LOCALIZATION NOTE pref-smart_browsing.dtd: The SmartBrowsing prefs dialog -->
-<!--LOCALIZATION NOTE title.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE : FILE The SmartBrowsing prefs dialog -->
+<!--LOCALIZATION NOTE (title.label): DONT_TRANSLATE -->
 <!ENTITY  title.label "Smart Browsing">
 
-<!--LOCALIZATION NOTE lHeader: Translate "What's Related" according to Netscape glossary -->
+<!--LOCALIZATION NOTE (lHeader): Translate "What's Related" according to Netscape glossary -->
 <!ENTITY  lHeader "What's Related">
 <!ENTITY  rHeader "Configure browsing aids">
-<!--LOCALIZATION NOTE enableRelatedRadio.label: Translate "What's Related" according to Netscape glossary -->
+<!--LOCALIZATION NOTE (enableRelatedRadio.label): Translate "What's Related" according to Netscape glossary -->
 <!ENTITY  enableRelatedRadio.label "Enable 'What's Related'">
-<!--LOCALIZATION NOTE autoDecp.label: Translate "What's Related" according to Netscape glossary -->
+<!--LOCALIZATION NOTE (autoDecp.label): Translate "What's Related" according to Netscape glossary -->
 <!ENTITY  autoDecp.label "Automatically load 'Whats Related' information">
 <!ENTITY  neverRadio "Never">
 <!ENTITY  afterAutoloadFirstRadio "After first use">
 <!ENTITY  afterAutoloadAlwaysRadio "Always">
-<!--LOCALIZATION NOTE doNotDecp.label: Translate "What's Related" according to Netscape glossary -->
+<!--LOCALIZATION NOTE (doNotDecp.label): Translate "What's Related" according to Netscape glossary -->
 <!ENTITY  doNotDecp.label "Do not request What's Related information for the following domains  (a comma-separated list)">
-<!--LOCALIZATION NOTE internetKeywordsHeader.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (internetKeywordsHeader.label): DONT_TRANSLATE -->
 <!ENTITY  internetKeywordsHeader.label "Internet Keywords">
-<!--LOCALIZATION NOTE enableKeyCheck.label: Do not translate 'Internet Keywords' -->
+<!--LOCALIZATION NOTE (enableKeyCheck.label): Do not translate 'Internet Keywords' -->
 <!ENTITY  enableKeyCheck.label "Enable Internet Keywords">
 
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd
index 3184c879949..c7f4b9e1e43 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd
@@ -1,9 +1,9 @@
-<!--LOCALIZATION NOTE pref-smartupdate.dtd: UI for Software Updates prefs -->
+<!--LOCALIZATION NOTE : FILE UI for Software Updates prefs -->
 <!ENTITY title.label "Software Installation">
 <!ENTITY header "Software Installation">
 <!ENTITY enableSU.label "Enable software installations">
 <!ENTITY enableNotification.label "Enable notification of new and updated software">
 <!ENTITY requireConfirmation.label "Require manual confirmation of each install">
-<!--LOCALIZATION NOTE selectUninstall.label: A large list box appears below this label -->
+<!--LOCALIZATION NOTE (selectUninstall.label): A large list box appears below this label -->
 <!ENTITY selectUninstall.label "To uninstall, select from the following list and click the uninstall button">
 <!ENTITY uninstallButton.label "Uninstall">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd b/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd
index 6f08c880524..b7fa7288531 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd
@@ -1,14 +1,14 @@
 <!-- extracted from content/preftree.xul -->
 
-<!--LOCALIZATION NOTE preftree.dtd: Lists preferences categories that appear on the left of the preferences dialog -->
+<!--LOCALIZATION NOTE : FILE Lists preferences categories that appear on the left of the preferences dialog -->
 <!ENTITY appear.label "Appearance">
 <!ENTITY fonts.label "Fonts">
 <!ENTITY colors.label "Colors">
-<!--LOCALIZATION NOTE navigator.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (navigator.label): DONT_TRANSLATE -->
 <!ENTITY navigator.label "Navigator">
 <!ENTITY languages.label "Languages">
 <!ENTITY applications.label "Applications">
-<!--LOCALIZATION NOTE smartBrowse.label: DONT_TRANSLATE -->
+<!--LOCALIZATION NOTE (smartBrowse.label): DONT_TRANSLATE -->
 <!ENTITY smartBrowse.label "Smart Browsing">
 <!ENTITY mail.label "Mail and Newsgroups">
 <!ENTITY address.label "Addressing">