diff --git a/mozilla/suite/debugQA/locales/en-US/pref-debug.dtd b/mozilla/suite/debugQA/locales/en-US/pref-debug.dtd
index 53849f365d8..5c3b9c86209 100644
--- a/mozilla/suite/debugQA/locales/en-US/pref-debug.dtd
+++ b/mozilla/suite/debugQA/locales/en-US/pref-debug.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/pref-debug.xul -->
 
-<!--LOCALIZATION NOTE pref-debug.dtd TRANSLATE NOTHING IN THIS FILE -->
+<!--LOCALIZATION NOTE pref-debug.dtd: DONT_TRANSLATE -->
 <!ENTITY window.title "Debug">
 
 <!ENTITY lHeader "Debug">
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd
index afff3a5d567..e9d4826e11b 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd
+++ b/mozilla/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 pref-advanced.dtd: '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/mozilla/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd
index 4fd638dc154..6b81e3bf362 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd
+++ b/mozilla/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 pref-appearance.dtd: 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 Product name. Never translate. -->
+<!--LOCALIZATION NOTE navCheck.label: DONT_TRANSLATE -->
 <!ENTITY navCheck.label "Navigator">
-<!--LOCALIZATION NOTE mesCheck.label Product name. Never translate. -->
+<!--LOCALIZATION NOTE mesCheck.label: DONT_TRANSLATE -->
 <!ENTITY mesCheck.label "Messenger">
-<!--LOCALIZATION NOTE compCheck.label Product name. Never translate. -->
+<!--LOCALIZATION NOTE compCheck.label: DONT_TRANSLATE -->
 <!ENTITY compCheck.label "Composer">
-<!--LOCALIZATION NOTE calCheck.label Product name. Never 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/mozilla/suite/locales/en-US/chrome/common/pref/pref-applications.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-applications.dtd
index cfe142193ae..f8d9a325667 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-applications.dtd
+++ b/mozilla/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 pref-applications.dtd: 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/mozilla/suite/locales/en-US/chrome/common/pref/pref-cache.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-cache.dtd
index a60857c57fa..bab07968793 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-cache.dtd
+++ b/mozilla/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 pref-cache.dtd: Cache prefs dialog -->
 <!ENTITY  title.label "Cache">
 <!ENTITY  lHeader "Cache">
 <!ENTITY  rHeader "Designate the size of the cache">
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-colors.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-colors.dtd
index 87c7f78532c..8a8cad20b25 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-colors.dtd
+++ b/mozilla/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 pref-colors.dtd: 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 Don't translate this term -->
+<!--LOCALIZATION NOTE colorPick: DONT_TRANSLATE -->
 <!ENTITY  colorPick "Color Picker">
 <!ENTITY  background "Background:">
 <!ENTITY  useWinColorsCheck.label "Use Windows colors">
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-debug.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-debug.dtd
index 53849f365d8..5c3b9c86209 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-debug.dtd
+++ b/mozilla/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 TRANSLATE NOTHING IN THIS FILE -->
+<!--LOCALIZATION NOTE pref-debug.dtd: DONT_TRANSLATE -->
 <!ENTITY window.title "Debug">
 
 <!ENTITY lHeader "Debug">
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-download.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-download.dtd
index dc42b48ca74..9262446d409 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-download.dtd
+++ b/mozilla/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 pref-download.dtd: '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/mozilla/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
index 1ef3c50d39c..aa2b4ae2f49 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
@@ -1,22 +1,23 @@
 <!-- extracted from content/pref-fonts.xul -->
 
-<!--LOCALIZATION NOTE pref-fonts.dtd 'Fonts' prefs dialog -->
+<!--LOCALIZATION NOTE pref-fonts.dtd: '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 Don't change this string -->
+<!--LOCALIZATION NOTE size1.option: DONT_TRANSLATE -->
 <!ENTITY  size1.option "10">
 <!ENTITY  varFont.select "Variable Width Font:">
-<!--LOCALIZATION NOTE varFont.option Don't change this string -->
+<!--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. -->
 <!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 useDocFont 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 -->
 <!ENTITY  useDocFontDynamic "Use document-specified fonts, including Dynamic Fonts">
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-languages.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-languages.dtd
index 9d0aa5ef352..0f269031fd4 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-languages.dtd
+++ b/mozilla/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 pref-languages.dtd: '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 Do not translate this term.  It'll be replaced at runtime -->
+<!--LOCALIZATION NOTE engOption.label: DONT_TRANSLATE -->
 <!ENTITY engOption.label  "English">
 <!ENTITY addButton.label  "Add...">
 <!ENTITY deleteButton.label  "Delete...">
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd
index b786806d391..c94a59df135 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd
+++ b/mozilla/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 pref-navigator.dtd: Navigator prefs screen -->
+<!--LOCALIZATION NOTE title.label: Never translate the term "Navigator" -->
 <!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 Do not change this numeric value. -->
+<!--LOCALIZATION NOTE histDay: DONT_TRANSLATE -->
 <!ENTITY  histDay "9">
 <!ENTITY  daysRadio "days">
 <!ENTITY  homepageRadio "Homepage">
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-offline.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-offline.dtd
index 2171d7e47f2..351a830ceb4 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-offline.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/pref/pref-offline.dtd
@@ -1,10 +1,10 @@
 <!-- extracted from content/pref-offline.xul -->
 
-<!--LOCALIZATION NOTE pref-offline.dtd The 'Offline' preferences dialog -->
+<!--LOCALIZATION NOTE pref-offline.dtd: 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">
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd
index 717123a2654..eddd9fd5c10 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-proxies.dtd
+++ b/mozilla/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 pref-proxies.dtd: The Proxies preferences dialog -->
 <!ENTITY  title.label "Sample Prefs Panel">
 <!ENTITY  lHeader  "Proxies">
 <!ENTITY  rHeader  "Configure proxies to access the Internet">
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-smart_browsing.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-smart_browsing.dtd
index 1c13f2728ee..8dff4f9812c 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-smart_browsing.dtd
+++ b/mozilla/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 Don't translate the term 'Smart Browsing' -->
+<!--LOCALIZATION NOTE pref-smart_browsing.dtd: 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-seprated list)">
-<!--LOCALIZATION NOTE internetKeywordsHeader.label Do not translate 'Internet Keywords' -->
+<!--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/mozilla/suite/locales/en-US/chrome/common/pref/pref-smartupdate.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-smartupdate.dtd
index cb976550160..3184c879949 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-smartupdate.dtd
+++ b/mozilla/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 pref-smartupdate.dtd: 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/mozilla/suite/locales/en-US/chrome/common/pref/preftree.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/preftree.dtd
index c331581bb9e..6f08c880524 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/preftree.dtd
+++ b/mozilla/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 preftree.dtd: 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 Don't translate the term 'Navigator' -->
+<!--LOCALIZATION NOTE navigator.label: DONT_TRANSLATE -->
 <!ENTITY navigator.label "Navigator">
 <!ENTITY languages.label "Languages">
 <!ENTITY applications.label "Applications">
-<!--LOCALIZATION NOTE smartBrowse.label Don't translate the term 'Smart Browsing' -->
+<!--LOCALIZATION NOTE smartBrowse.label: DONT_TRANSLATE -->
 <!ENTITY smartBrowse.label "Smart Browsing">
 <!ENTITY mail.label "Mail and Newsgroups">
 <!ENTITY address.label "Addressing">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/PrefsWindow.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/PrefsWindow.dtd
index f060deacc1b..bf2a80f8652 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/PrefsWindow.dtd
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/PrefsWindow.dtd
@@ -1,6 +1,6 @@
 <!-- extracted from content/PrefsWindow.xul -->
 
-<!-- LOCALIZATION NOTE PrefsWindow.dtd UI for the outer parts of the Prefs dialog -->
+<!-- LOCALIZATION NOTE PrefsWindow.dtd: UI for the outer parts of the Prefs dialog -->
 <!ENTITY categoryHeader "Category">
 <!ENTITY window.title "Preferences">
 <!ENTITY helpButton.label "Help">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
index afff3a5d567..e9d4826e11b 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
+++ b/mozilla/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 pref-advanced.dtd: '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/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
index 4fd638dc154..6b81e3bf362 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
+++ b/mozilla/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 pref-appearance.dtd: 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 Product name. Never translate. -->
+<!--LOCALIZATION NOTE navCheck.label: DONT_TRANSLATE -->
 <!ENTITY navCheck.label "Navigator">
-<!--LOCALIZATION NOTE mesCheck.label Product name. Never translate. -->
+<!--LOCALIZATION NOTE mesCheck.label: DONT_TRANSLATE -->
 <!ENTITY mesCheck.label "Messenger">
-<!--LOCALIZATION NOTE compCheck.label Product name. Never translate. -->
+<!--LOCALIZATION NOTE compCheck.label: DONT_TRANSLATE -->
 <!ENTITY compCheck.label "Composer">
-<!--LOCALIZATION NOTE calCheck.label Product name. Never 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/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd
index cfe142193ae..f8d9a325667 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd
+++ b/mozilla/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 pref-applications.dtd: 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/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
index a60857c57fa..bab07968793 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
+++ b/mozilla/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 pref-cache.dtd: Cache prefs dialog -->
 <!ENTITY  title.label "Cache">
 <!ENTITY  lHeader "Cache">
 <!ENTITY  rHeader "Designate the size of the cache">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd
index 87c7f78532c..8a8cad20b25 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd
+++ b/mozilla/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 pref-colors.dtd: 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 Don't translate this term -->
+<!--LOCALIZATION NOTE colorPick: DONT_TRANSLATE -->
 <!ENTITY  colorPick "Color Picker">
 <!ENTITY  background "Background:">
 <!ENTITY  useWinColorsCheck.label "Use Windows colors">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd
index b80b23a9ded..bdfc48fdb6e 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd
@@ -1,8 +1,8 @@
 <!-- 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 pref-composer.dtd: 'Composer' prefs dialog. Similar to Communcator 4.x Document Properties/Colors and Background -->
 
-<!--LOCALIZATION NOTE title.label Never translate the term 'Composer' -->
+<!--LOCALIZATION NOTE title.label: DONT_TRANSLATE -->
 <!ENTITY  title.label "Composer">
 <!ENTITY  lHeader "Composer">
 <!ENTITY  rHeader "Set general preferences for authoring of Web pages">
@@ -23,5 +23,5 @@
 <!ENTITY  ActiveLinkText.label "Active Link Text">
 <!ENTITY  FollowedLinkText.label "Followed Link Text">
 <!ENTITY  BackgroundColor.label "Background">
-<!--LOCALIZATION NOTE colorPick Don't translate this term -->
+<!--LOCALIZATION NOTE colorPick: DONT_TRANSLATE -->
 <!ENTITY  colorPick "ColorPicker">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-debug.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-debug.dtd
index 53849f365d8..5c3b9c86209 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-debug.dtd
+++ b/mozilla/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 TRANSLATE NOTHING IN THIS FILE -->
+<!--LOCALIZATION NOTE pref-debug.dtd: DONT_TRANSLATE -->
 <!ENTITY window.title "Debug">
 
 <!ENTITY lHeader "Debug">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-download.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-download.dtd
index dc42b48ca74..9262446d409 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-download.dtd
+++ b/mozilla/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 pref-download.dtd: '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/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
index 1ef3c50d39c..aa2b4ae2f49 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
@@ -1,22 +1,23 @@
 <!-- extracted from content/pref-fonts.xul -->
 
-<!--LOCALIZATION NOTE pref-fonts.dtd 'Fonts' prefs dialog -->
+<!--LOCALIZATION NOTE pref-fonts.dtd: '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 Don't change this string -->
+<!--LOCALIZATION NOTE size1.option: DONT_TRANSLATE -->
 <!ENTITY  size1.option "10">
 <!ENTITY  varFont.select "Variable Width Font:">
-<!--LOCALIZATION NOTE varFont.option Don't change this string -->
+<!--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. -->
 <!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 useDocFont 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 -->
 <!ENTITY  useDocFontDynamic "Use document-specified fonts, including Dynamic Fonts">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-languages.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-languages.dtd
index 9d0aa5ef352..0f269031fd4 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-languages.dtd
+++ b/mozilla/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 pref-languages.dtd: '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 Do not translate this term.  It'll be replaced at runtime -->
+<!--LOCALIZATION NOTE engOption.label: DONT_TRANSLATE -->
 <!ENTITY engOption.label  "English">
 <!ENTITY addButton.label  "Add...">
 <!ENTITY deleteButton.label  "Delete...">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
index b786806d391..c94a59df135 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
+++ b/mozilla/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 pref-navigator.dtd: Navigator prefs screen -->
+<!--LOCALIZATION NOTE title.label: Never translate the term "Navigator" -->
 <!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 Do not change this numeric value. -->
+<!--LOCALIZATION NOTE histDay: DONT_TRANSLATE -->
 <!ENTITY  histDay "9">
 <!ENTITY  daysRadio "days">
 <!ENTITY  homepageRadio "Homepage">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd
index 2171d7e47f2..351a830ceb4 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd
@@ -1,10 +1,10 @@
 <!-- extracted from content/pref-offline.xul -->
 
-<!--LOCALIZATION NOTE pref-offline.dtd The 'Offline' preferences dialog -->
+<!--LOCALIZATION NOTE pref-offline.dtd: 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">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd
index 717123a2654..eddd9fd5c10 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd
+++ b/mozilla/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 pref-proxies.dtd: The Proxies preferences dialog -->
 <!ENTITY  title.label "Sample Prefs Panel">
 <!ENTITY  lHeader  "Proxies">
 <!ENTITY  rHeader  "Configure proxies to access the Internet">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-publish.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-publish.dtd
index 2a1a4f98d8e..b9551da284b 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-publish.dtd
+++ b/mozilla/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 pref-publish.dtd: 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/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
index 1c13f2728ee..8dff4f9812c 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
+++ b/mozilla/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 Don't translate the term 'Smart Browsing' -->
+<!--LOCALIZATION NOTE pref-smart_browsing.dtd: 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-seprated list)">
-<!--LOCALIZATION NOTE internetKeywordsHeader.label Do not translate 'Internet Keywords' -->
+<!--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/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd
index cb976550160..3184c879949 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd
+++ b/mozilla/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 pref-smartupdate.dtd: 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/mozilla/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd
index c331581bb9e..6f08c880524 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd
+++ b/mozilla/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 preftree.dtd: 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 Don't translate the term 'Navigator' -->
+<!--LOCALIZATION NOTE navigator.label: DONT_TRANSLATE -->
 <!ENTITY navigator.label "Navigator">
 <!ENTITY languages.label "Languages">
 <!ENTITY applications.label "Applications">
-<!--LOCALIZATION NOTE smartBrowse.label Don't translate the term 'Smart Browsing' -->
+<!--LOCALIZATION NOTE smartBrowse.label: DONT_TRANSLATE -->
 <!ENTITY smartBrowse.label "Smart Browsing">
 <!ENTITY mail.label "Mail and Newsgroups">
 <!ENTITY address.label "Addressing">