diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/aw-done.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/aw-done.dtd
index 91ea0b49753..ecad3191691 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/aw-done.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/aw-done.dtd
@@ -3,4 +3,5 @@
 <!ENTITY completionText.label "You have entered all the information required to set up this account.">
 <!ENTITY userNamePrefix.label "User Name:">
 <!ENTITY emailPrefix.label "Email Address:">
+<!-- LOCALIZATION NOTE (setupAnother.label) : do not translate the 2 "&quot" in the next line -->
 <!ENTITY setupAnother.label "Click &quot;Set up Another&quot; to save these settings and set up another account.">
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-diskspace.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-diskspace.dtd
index d44b4734973..f65dee7806e 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-diskspace.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-diskspace.dtd
@@ -18,24 +18,24 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 
 
-<!-- LOCALIZATION NOTE pref-diskspace.dtd UI for Mail/News Disk Space prefs -->
+<!-- LOCALIZATION NOTE pref-diskspace.dtd: UI for Mail/News Disk Space prefs -->
 <!ENTITY window.title "Disk Space">
 <!ENTITY pane.title "Disk Space">
 <!ENTITY allMsg.label "All Messages">
-<!-- LOCALIZATION NOTE storeMsgLimit.label This string is followed by a number, then by kb.label -->
+<!-- LOCALIZATION NOTE storeMsgLimit.label: This string is followed by a number, then by kb.label -->
 <!ENTITY storeMsgLimit.label "Do not store messages locally that are larger than">
-<!-- LOCALIZATION NOTE autoCompact.label This string is followed by a number, then by kb.label -->
+<!-- LOCALIZATION NOTE autoCompact.label: This string is followed by a number, then by kb.label -->
 <!ENTITY autoCompact.label "Automatically compact folders when it will save over">
 <!ENTITY kb.label " kB">
 <!ENTITY newgroupMsgOnly.label " Newsgroup Messages Only">
 <!ENTITY whenToClean.label "When it's time to clean up messages:">
-<!-- LOCALIZATION NOTE keepMsgs.label This string is followed by a number, then by days.label -->
+<!-- LOCALIZATION NOTE keepMsgs.label: This string is followed by a number, then by days.label -->
 <!ENTITY keepMsgs.label "Keep messages which have arrived within the past">
 <!ENTITY days.label "days">
 <!ENTITY keepAllMsg.label "Keep all messages">
-<!-- LOCALIZATION NOTE keepTheNewest.label This string is followed by a number, then by messages.label -->
+<!-- LOCALIZATION NOTE keepTheNewest.label: This string is followed by a number, then by messages.label -->
 <!ENTITY keepTheNewest.label "Keep the newest">
 <!ENTITY messages.label "messages">
 <!ENTITY keepUnread.label "Keep only unread messages">
-<!-- LOCALIZATION NOTE removeMsg.label This string is followed by a number, then by days.label -->
+<!-- LOCALIZATION NOTE removeMsg.label: This string is followed by a number, then by days.label -->
 <!ENTITY removeMsg.label "Remove message bodies only older than">
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
index e74058e3210..e5abe930a9a 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
@@ -18,7 +18,7 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 
 
-<!-- LOCALIZATION NOTE pref-mailnews.dtd UI for Mail/News prefs -->
+<!-- LOCALIZATION NOTE pref-mailnews.dtd: UI for Mail/News prefs -->
 <!ENTITY window.title "Mail &amp; Newsgroups">
 <!ENTITY pane.title "Mail &amp; Newsgroups">
 <!ENTITY textBegin.label "Plain quoted text beginning with '>' is displayed with">
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
index 793c1cc28c1..36d5105d7b7 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
@@ -18,7 +18,7 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 
 
-<!-- LOCALIZATION NOTE pref-receipts.dtd UI for Mail/News Return Receipts prefs -->
+<!-- LOCALIZATION NOTE pref-receipts.dtd: UI for Mail/News Return Receipts prefs -->
 <!ENTITY window.title "Return Receipts">
 <!ENTITY pane.title "Return Receipts">
 <!ENTITY requestReceipt.label " If I request a receipt when sending a message, I want">
@@ -27,7 +27,7 @@ Rights Reserved.
 <!ENTITY both.label "Both types of receipt">
 <!ENTITY receiptArrive.label " When a receipt arrives">
 <!ENTITY leaveIt.label "Leave it in my Inbox">
-<!-- LOCALIZATION NOTE moveToSent.label Translate 'Sent Mail' according to Netscape glossary -->
+<!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent Mail' according to Netscape glossary -->
 <!ENTITY moveToSent.label "Move it to my Sent Mail folder">
 <!ENTITY requestMDN.label " When I receive a message and the sender requested a receipt (MDN)">
 <!ENTITY returnSome.label "Return receipts for some messages">
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-winsetting.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-winsetting.dtd
index fcf0aed2886..38fbb2234bc 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-winsetting.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-winsetting.dtd
@@ -18,10 +18,10 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 
 
-<!-- LOCALIZATION NOTE pref-winsetting.dtd UI for Mail & News Window Settings prefs -->
+<!-- LOCALIZATION NOTE pref-winsetting.dtd: UI for Mail & News Window Settings prefs -->
 <!ENTITY window.title "Window Setting">
 <!ENTITY pane.title "Window Setting">
-<!-- LOCALIZATION NOTE chooseLayout.label Never translate the product name "Messenger" -->
+<!-- LOCALIZATION NOTE chooseLayout.label: Never translate the product name "Messenger" -->
 <!ENTITY chooseLayout.label "Choose which layout you prefer for the Messenger window:">
 <!-- LOCALIZATION NOTE chooseExp.label Never translate the product name "Messenger" -->
 <!ENTITY chooseExp.label "Note:  a change to this setting will only take effect the next time you open a Messenger window.">
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/pref/pref-mailnews.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/pref/pref-mailnews.dtd
index e74058e3210..e5abe930a9a 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/pref/pref-mailnews.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/pref/pref-mailnews.dtd
@@ -18,7 +18,7 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 
 
-<!-- LOCALIZATION NOTE pref-mailnews.dtd UI for Mail/News prefs -->
+<!-- LOCALIZATION NOTE pref-mailnews.dtd: UI for Mail/News prefs -->
 <!ENTITY window.title "Mail &amp; Newsgroups">
 <!ENTITY pane.title "Mail &amp; Newsgroups">
 <!ENTITY textBegin.label "Plain quoted text beginning with '>' is displayed with">
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/pref/pref-receipts.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/pref/pref-receipts.dtd
index 793c1cc28c1..36d5105d7b7 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/pref/pref-receipts.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/pref/pref-receipts.dtd
@@ -18,7 +18,7 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 
 
-<!-- LOCALIZATION NOTE pref-receipts.dtd UI for Mail/News Return Receipts prefs -->
+<!-- LOCALIZATION NOTE pref-receipts.dtd: UI for Mail/News Return Receipts prefs -->
 <!ENTITY window.title "Return Receipts">
 <!ENTITY pane.title "Return Receipts">
 <!ENTITY requestReceipt.label " If I request a receipt when sending a message, I want">
@@ -27,7 +27,7 @@ Rights Reserved.
 <!ENTITY both.label "Both types of receipt">
 <!ENTITY receiptArrive.label " When a receipt arrives">
 <!ENTITY leaveIt.label "Leave it in my Inbox">
-<!-- LOCALIZATION NOTE moveToSent.label Translate 'Sent Mail' according to Netscape glossary -->
+<!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent Mail' according to Netscape glossary -->
 <!ENTITY moveToSent.label "Move it to my Sent Mail folder">
 <!ENTITY requestMDN.label " When I receive a message and the sender requested a receipt (MDN)">
 <!ENTITY returnSome.label "Return receipts for some messages">