diff --git a/mozilla/mail/locales/en-US/chrome/navigator/navigator.properties b/mozilla/mail/locales/en-US/chrome/navigator/navigator.properties
index 3404353b246..3042d9fa177 100644
--- a/mozilla/mail/locales/en-US/chrome/navigator/navigator.properties
+++ b/mozilla/mail/locales/en-US/chrome/navigator/navigator.properties
@@ -23,7 +23,14 @@ jserror=An error has occurred on this page. Double click here for details.
 # charset names and use canonical names exactly as listed there.
 # Also, note that UTF-8 MUST be listed in intl.charsetmenu.browser.static.
 general.useragent.locale=en-US
+# Localization Note: font.language.group controls the initial setting of the
+# language drop-down in the fonts pref panel. Set it to the value of one of the
+# menuitems in the "selectLangs" menulist in
+# /mail/components/preferences/fonts.xul
 font.language.group=x-western
+# Localization Note: Add the code for your language at the front of this entry,
+# leaving "en-us, en" for fallback. It's recommended to use the same form, e.g.
+# "ja-jp, ja, en-us, en"
 intl.accept_languages=en-us, en
 intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
 intl.charsetmenu.browser.more1=ISO-8859-1, ISO-8859-15, IBM850, x-mac-roman, windows-1252, ISO-8859-14, ISO-8859-7, x-mac-greek, windows-1253, x-mac-icelandic, ISO-8859-10, ISO-8859-3
diff --git a/mozilla/toolkit/locales/en-US/chrome/global/intl.properties b/mozilla/toolkit/locales/en-US/chrome/global/intl.properties
index d08625cb90e..5f3c3f93bcd 100644
--- a/mozilla/toolkit/locales/en-US/chrome/global/intl.properties
+++ b/mozilla/toolkit/locales/en-US/chrome/global/intl.properties
@@ -6,7 +6,14 @@
 # charset names and use canonical names exactly as listed there.
 # Also note that "UTF-8" should always be included in intl.charsetmenu.browser.static
 general.useragent.locale=en-US
+# Localization Note: font.language.group controls the initial setting of the
+# language drop-down in the fonts pref panel. Set it to the value of one of the
+# menuitems in the "selectLangs" menulist in
+# browser/components/preferences/fonts.xul
 font.language.group=x-western
+# Localization Note: Add the code for your language at the front of this entry,
+# leaving "en-us, en" for fallback. It's recommended to use the same form, e.g.
+# "ja-jp, ja, en-us, en"
 intl.accept_languages=en-us, en
 intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
 intl.charsetmenu.browser.more1=ISO-8859-1, ISO-8859-15, IBM850, x-mac-roman, windows-1252, ISO-8859-14, ISO-8859-7, x-mac-greek, windows-1253, x-mac-icelandic, ISO-8859-10, ISO-8859-3
diff --git a/mozilla/xpfe/browser/resources/locale/en-US/navigator.properties b/mozilla/xpfe/browser/resources/locale/en-US/navigator.properties
index 45fd9e19215..85e00185834 100644
--- a/mozilla/xpfe/browser/resources/locale/en-US/navigator.properties
+++ b/mozilla/xpfe/browser/resources/locale/en-US/navigator.properties
@@ -23,7 +23,14 @@ jserror=An error has occurred on this page. Double click here for details.
 # charset names and use canonical names exactly as listed there.
 # Also, note that UTF-8 MUST be listed in intl.charsetmenu.browser.static.
 general.useragent.locale=en-US
+# Localization Note: font.language.group controls the initial setting of the
+# language drop-down in the fonts pref panel. Set it to the value of one of the
+# menuitems in the "selectLangs" menulist in
+# /xpfe/components/prefwindow/resources/content/pref-fonts.xul 
 font.language.group=x-western
+# Localization Note: Add the code for your language at the front of this entry,
+# leaving "en-us, en" for fallback. It's recommended to use the same form, e.g.
+# "ja-jp, ja, en-us, en"
 intl.accept_languages=en-us, en
 intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
 intl.charsetmenu.browser.more1=ISO-8859-1, ISO-8859-15, IBM850, x-mac-roman, windows-1252, ISO-8859-14, ISO-8859-7, x-mac-greek, windows-1253, x-mac-icelandic, ISO-8859-10, ISO-8859-3