diff --git a/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-messages.dtd b/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-messages.dtd
index 88133111b29..48a86f256d2 100644
--- a/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-messages.dtd
+++ b/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-messages.dtd
@@ -40,8 +40,11 @@ Rights Reserved.
 <!ENTITY use8Bits.label "Send messages that use 8-bit characters">
 <!ENTITY cleanupMsg.label "When it's time to clean up messages:">
 <!ENTITY asIs.label "As is (does not work well with some mail servers)">
+<!-- LOCALIZATION NOTE (useMIMEpart1.label): Concatenates with useMIMEpart2.label -->
 <!ENTITY useMIMEpart1.label "Using the 'quoted printable' MIME encoding">
+<!-- LOCALIZATION NOTE (useMIMEpart2.label): Concatenates with useMIMEpart1.label -->
 <!ENTITY useMIMEpart2.label "(does not work well with some mail or newsgroups readers)">
+<!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
 <!ENTITY emoticonsAndStructs.label "Emoticons And Structs">
 <!ENTITY convertEmoticons.label "When viewing a text message, convert emoticons to glyphs.">
 <!ENTITY convertStructs.label "When viewing a text message, convert structs to styles.">
diff --git a/mozilla/profile/pref-migrator/resources/locale/en-US/profileMigrationProgress.dtd b/mozilla/profile/pref-migrator/resources/locale/en-US/profileMigrationProgress.dtd
index 04c14cb4b5e..8706cda029d 100644
--- a/mozilla/profile/pref-migrator/resources/locale/en-US/profileMigrationProgress.dtd
+++ b/mozilla/profile/pref-migrator/resources/locale/en-US/profileMigrationProgress.dtd
@@ -1,4 +1,5 @@
 <!ENTITY dialogCancel.label "Cancel"> 
+<!-- LOCALIZATION NOTE (window.title) : 'Migrating' refers to converting settings to Mozilla format. -->
 <!ENTITY window.title "Migrating..."> 
 <!ENTITY dialogTitle.label "Migrating user profile">
 <!ENTITY currentlyProcessing.text "This may take a little while.">
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 b0406b8a201..de2f5e7237f 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 : FILE 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">
@@ -14,6 +14,9 @@
 <!ENTITY  links "Links">
 <!ENTITY  unvisit "Unvisited Links:">
 <!ENTITY  visit "Visited Links:">
+<!-- LOCALIZATION NOTE (someProvColors): This is the start of a sentence and will be followed by the following radio buttons. -->
 <!ENTITY  someProvColors "When a webpage provides its own colors and background:">
+<!-- LOCALIZATION NOTE (alwaysUseDocColors.label): This is option one, and it appends to 'someProvColors' above. -->
 <!ENTITY  alwaysUseDocColors.label "use the colors and background supplied by the webpage">
+<!-- LOCALIZATION NOTE (ignoreDocColors.label): This is option two, and it appends to 'someProvColors' above.  -->
 <!ENTITY  ignoreDocColors.label "use my chosen colors, ignoring the colors provided">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd
index 9ecf9706cf0..443a62bb7dc 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd
@@ -1,9 +1,9 @@
+<!-- LOCALIZATION NOTE : FILE Cookie management prefs -->
+
 <!ENTITY window.title "Cookies">
 <!ENTITY lHeader "Cookies">
 <!ENTITY remSignCheck.label "Automatically prefill usernames and passwords">
 <!ENTITY rHeader "Manage cookies stored on your computer">
-<!--LOCALIZATION NOTE (server.label): 'Wallet' is a product name and should not be translated. -->
-
 <!ENTITY cookies "Cookies">
 <!ENTITY accAllCookiesRadio.label "Accept all cookies">
 <!ENTITY accpOrgCookiesRadio.label "Only accept only cookies that get sent back to the originating server">
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 cd3ab09a7e8..a6e2c8b838c 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,6 +1,6 @@
 <!-- extracted from content/pref-fonts.xul -->
 
-<!--LOCALIZATION NOTE : FILE 'Fonts' prefs dialog -->
+<!-- LOCALIZATION NOTE : FILE 'Fonts' prefs dialog -->
 <!ENTITY  window.title "Fonts">
 <!ENTITY  lHeader "Fonts">
 <!ENTITY  rHeader "Font settings for webpage display">
@@ -9,15 +9,15 @@
 <!ENTITY  encod1.option "Western">
 <!ENTITY  size.select "Size">
 <!ENTITY  fontsFor.select "Fonts for:">
-<!--LOCALIZATION NOTE (size1.option): DONT_TRANSLATE -->
 <!ENTITY  serif.select  "Serif:">
 <!ENTITY  sans-serif.select  "Sans-Serif:">
 <!ENTITY  monospace.select  "Monospace:">
+<!-- LOCALIZATION NOTE (fantasy.select): 'Fantasy' means 'Ornate' -->
 <!ENTITY  fantasy.select  "Fantasy:">
 <!ENTITY  cursive.select  "Cursive:">
+<!-- LOCALIZATION NOTE (size1.option): DONT_TRANSLATE -->
 <!ENTITY  size1.option "10">
 <!ENTITY  varFont.select "Variable Width Font:">
-<!--LOCALIZATION NOTE (varFont.option): DONT_TRANSLATE -->
 <!ENTITY  font8.option "8">
 <!ENTITY  font9.option "9">
 <!ENTITY  font10.option "10">
@@ -35,17 +35,17 @@
 <!ENTITY  font48.option "48">
 <!ENTITY  font72.option "72">
 <!ENTITY  fixedFont.Select "Fixed Width Font">
-<!--LOCALIZATION NOTE (fixedFont.option): DONT_TRANSLATE -->
+<!-- LOCALIZATION NOTE (fixedFont.option): DONT_TRANSLATE -->
 <!ENTITY  fixedFont.option "Filler">
 <!ENTITY  header2 "When a webpage chooses its own fonts">
 <!ENTITY  useDefaultFont "Use my default fonts, ignoring the fonts the page has chosen">
-<!--LOCALIZATION NOTE (useDocFontNonDynamic): Translate 'Dynamic Fonts' according to Netscape Glossary -->
+<!-- LOCALIZATION NOTE (useDocFontNonDynamic): Translate 'Dynamic Fonts' according to Netscape Glossary -->
 <!ENTITY  useDocFontNonDynamic "Use the fonts chosen by the page, but ignore 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 all the fonts chosen by the page, including Dynamic Fonts">
 <!-- font scaling -->
 <!ENTITY  fontScaling "Font Scaling">
 <!ENTITY  fontScalingIntro "Choose a resolution at which fonts will be displayed. A larger value can improve text visibility on some computers.">
 <!ENTITY  defaultScaling "96">
 <!ENTITY  fontScalingExample "dpi. (e.g. 96dpi)">
-<!ENTITY  resolution "Font display resolution:">
\ No newline at end of file
+<!ENTITY  resolution "Font display resolution:">
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 84e514d2d54..3b6735b6a65 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,6 +1,6 @@
 <!-- extracted from content/pref-languages.xul -->
 
-<!--LOCALIZATION NOTE : FILE 'Languages' preferences dialog -->
+<!-- LOCALIZATION NOTE : FILE 'Languages' preferences dialog -->
 <!ENTITY  window.title "Languages">
 <!ENTITY  lHeader "Languages">
 <!ENTITY  rHeader "Languages in which webpages are displayed">
@@ -8,11 +8,12 @@
 			in which you prefer to view web pages. Web pages are sometimes 
 			available in several languages.  Navigator presents pages in 
 			the available language you most prefer.">
-<!--LOCALIZATION NOTE (engOption.label): DONT_TRANSLATE -->
+<!-- LOCALIZATION NOTE (engOption.label): DONT_TRANSLATE -->
 <!ENTITY engOrder.label "1">
 <!ENTITY engOption.label  "English">
 <!ENTITY addButton.label  "Add...">
 <!ENTITY deleteButton.label  "Delete...">
+<!-- LOCALIZATION NOTE (orderColumnHeader): This column heading refers to the sequence in which the chosen items appear. -->
 <!ENTITY orderColumnHeader.label "Order">
 <!ENTITY languageColumnHeader.label "Language">
- 
\ No newline at end of file
+ 
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd
index 7533aa54927..912b0050fe6 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd
@@ -1,3 +1,5 @@
+<!-- LOCALIZATION NOTE : FILE Mouse-wheel management prefs, for those lucky OSes that support mouse wheels -->
+
 <!ENTITY title.label "Mouse Wheel">
 <!ENTITY info.label "Mouse Wheel Configuration">
 <!ENTITY mouseWheelPanel.label "When ">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-proxy-manual.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-proxy-manual.dtd
index b5cbde58836..7c03e818eba 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-proxy-manual.dtd
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-proxy-manual.dtd
@@ -1,3 +1,5 @@
+<!-- LOCALIZATION NOTE : FILE Proxy management prefs -->
+
 <!ENTITY window.title "View Manual Proxy Configuration">
 <!ENTITY intro.label "You may configure a proxy and port number for each of the internet protocols that Netscape supports.">
 <!ENTITY ftp.label "FTP Proxy:">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-search.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-search.dtd
index a8546e5fc03..53eab794193 100755
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-search.dtd
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-search.dtd
@@ -1,10 +1,10 @@
 <!-- extracted from content/pref-search.xul -->
 
-<!--LOCALIZATION NOTE : FILE The Search prefs dialog -->
-<!--LOCALIZATION NOTE (title.label): DONT_TRANSLATE -->
+<!-- LOCALIZATION NOTE : FILE The Search prefs dialog -->
+<!-- LOCALIZATION NOTE (title.label): DONT_TRANSLATE -->
 <!ENTITY  title.label "Search">
 
-<!--LOCALIZATION NOTE (lHeader): Translate "Search" according to Netscape glossary -->
+<!--L OCALIZATION NOTE (lHeader): Translate "Search" according to Netscape glossary -->
 <!ENTITY  lHeader "Search">
 <!ENTITY  rHeader "Configure Search">
 <!ENTITY  legendHeader "When clicking the 'Search' button:">
@@ -12,6 +12,6 @@
 <!ENTITY  enablePowerSearch.label "Open the Search window (search multiple engines)">
 <!ENTITY  openSidebarSearchPanel.label "Open the 'Search Results' Sidebar panel when results are available">
 
-<!--LOCALIZATION NOTE (defaultengine.label): Keep parenthesis so it sorts to the first position in the list -->
+<!-- LOCALIZATION NOTE (defaultengine.label): Keep parenthesis so it sorts to the first position in the list -->
 <!ENTITY  defaultengine.label "(Default)">
-<!ENTITY  searchResults.label "Search Results">
\ No newline at end of file
+<!ENTITY  searchResults.label "Search Results">