diff --git a/browser/extensions/inspector/content/contents.rdf.in b/browser/extensions/inspector/content/contents.rdf.in
index 444b10e17e1..e69de29bb2d 100644
--- a/browser/extensions/inspector/content/contents.rdf.in
+++ b/browser/extensions/inspector/content/contents.rdf.in
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://inspector/content/tasksOverlay.xul
-
-
-
-
-
- chrome://inspector/content/viewers/dom/commandOverlay.xul
- chrome://inspector/content/viewers/styleRules/commandOverlay.xul
- chrome://inspector/content/search/modules/commandOverlay.xul
-
-
-
- chrome://inspector/content/viewers/dom/keysetOverlay.xul
-
-
-
- chrome://inspector/content/viewers/dom/popupOverlay.xul
- chrome://inspector/content/viewers/styleRules/popupOverlay.xul
- chrome://inspector/content/search/modules/popupOverlay.xul
-
-
-
diff --git a/client.mk b/client.mk
index 75455d85c5b..81156bb375f 100644
--- a/client.mk
+++ b/client.mk
@@ -693,6 +693,8 @@ CONFIG_STATUS_DEPS := \
$(wildcard $(TOPSRCDIR)/mailnews/makefiles) \
$(CONFIG_STATUS_DEPS_L10N) \
$(wildcard $(TOPSRCDIR)/themes/makefiles) \
+ $(wildcard $(TOPSRCDIR)/config/milestone.txt) \
+ $(wildcard $(TOPSRCDIR)/config/chrome-versions.sh) \
$(NULL)
# configure uses the program name to determine @srcdir@. Calling it without
diff --git a/config/chrome-versions.sh b/config/chrome-versions.sh
new file mode 100644
index 00000000000..b283e16e989
--- /dev/null
+++ b/config/chrome-versions.sh
@@ -0,0 +1,4 @@
+# This is a shell script, sourced by configure.
+
+MOZILLA_LOCALE_VERSION=1.6b
+MOZILLA_REGION_VERSION=1.6b
diff --git a/configure b/configure
index b3a98d99d70..c5f4e8f8bf5 100755
--- a/configure
+++ b/configure
@@ -15167,6 +15167,10 @@ EOF
+. ${srcdir}/config/chrome-versions.sh
+
+
+
@@ -15721,6 +15725,8 @@ s%@MOZ_MOVEMAIL@%$MOZ_MOVEMAIL%g
s%@LIBS_PATH@%$LIBS_PATH%g
s%@CYGDRIVE_MOUNT@%$CYGDRIVE_MOUNT%g
s%@MOZILLA_VERSION@%$MOZILLA_VERSION%g
+s%@MOZILLA_LOCALE_VERSION@%$MOZILLA_LOCALE_VERSION%g
+s%@MOZILLA_REGION_VERSION@%$MOZILLA_REGION_VERSION%g
s%@ac_configure_args@%$ac_configure_args%g
s%@MOZ_DEFINES@%$MOZ_DEFINES%g
diff --git a/configure.in b/configure.in
index 903b351c61b..d19ddecdb91 100644
--- a/configure.in
+++ b/configure.in
@@ -5312,6 +5312,10 @@ MOZILLA_VERSION=`$PERL $srcdir/config/milestone.pl -topsrcdir $srcdir`
AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
AC_SUBST(MOZILLA_VERSION)
+. ${srcdir}/config/chrome-versions.sh
+AC_SUBST(MOZILLA_LOCALE_VERSION)
+AC_SUBST(MOZILLA_REGION_VERSION)
+
AC_SUBST(ac_configure_args)
dnl Spit out some output
diff --git a/directory/xpcom/base/resources/content/contents.rdf.in b/directory/xpcom/base/resources/content/contents.rdf.in
index fe1181183c8..e69de29bb2d 100644
--- a/directory/xpcom/base/resources/content/contents.rdf.in
+++ b/directory/xpcom/base/resources/content/contents.rdf.in
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/directory/xpcom/base/resources/locale/en-US/contents.rdf.in b/directory/xpcom/base/resources/locale/en-US/contents.rdf.in
index 588267c84e7..e69de29bb2d 100644
--- a/directory/xpcom/base/resources/locale/en-US/contents.rdf.in
+++ b/directory/xpcom/base/resources/locale/en-US/contents.rdf.in
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/editor/ui/composer/content/contents-region.rdf.in b/editor/ui/composer/content/contents-region.rdf.in
index d2534f879d2..e69de29bb2d 100644
--- a/editor/ui/composer/content/contents-region.rdf.in
+++ b/editor/ui/composer/content/contents-region.rdf.in
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/editor/ui/composer/content/contents.rdf.in b/editor/ui/composer/content/contents.rdf.in
index 1e975a66d7d..e69de29bb2d 100644
--- a/editor/ui/composer/content/contents.rdf.in
+++ b/editor/ui/composer/content/contents.rdf.in
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://editor/content/editorTasksOverlay.xul
-
-
-
-
- chrome://editor/content/editorPrefsOverlay.xul
-
-
-
-
- chrome://editor/content/editorPrefsOverlay.xul
-
-
-
-
- chrome://editor/content/editorNavigatorOverlay.xul
-
-
-
-
- chrome://editor/content/editorMailOverlay.xul
-
-
-
-
-
diff --git a/editor/ui/composer/locale/en-US/contents-region.rdf.in b/editor/ui/composer/locale/en-US/contents-region.rdf.in
index ad99bf98ed3..e69de29bb2d 100644
--- a/editor/ui/composer/locale/en-US/contents-region.rdf.in
+++ b/editor/ui/composer/locale/en-US/contents-region.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/editor/ui/composer/locale/en-US/contents.rdf.in b/editor/ui/composer/locale/en-US/contents.rdf.in
index 42c576e0ef4..e69de29bb2d 100644
--- a/editor/ui/composer/locale/en-US/contents.rdf.in
+++ b/editor/ui/composer/locale/en-US/contents.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/content-packs/resources/content/contents.rdf.in b/extensions/content-packs/resources/content/contents.rdf.in
index 37f0c9e3cca..e69de29bb2d 100644
--- a/extensions/content-packs/resources/content/contents.rdf.in
+++ b/extensions/content-packs/resources/content/contents.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://content-packs/content/prefOverlay.xul
-
-
diff --git a/extensions/content-packs/resources/locale/en-US/contents.rdf.in b/extensions/content-packs/resources/locale/en-US/contents.rdf.in
index 77c449b1516..e69de29bb2d 100644
--- a/extensions/content-packs/resources/locale/en-US/contents.rdf.in
+++ b/extensions/content-packs/resources/locale/en-US/contents.rdf.in
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/cookie/resources/content/contents.rdf.in b/extensions/cookie/resources/content/contents.rdf.in
index ad2a4d9186e..e69de29bb2d 100644
--- a/extensions/cookie/resources/content/contents.rdf.in
+++ b/extensions/cookie/resources/content/contents.rdf.in
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://cookie/content/cookieContextOverlay.xul
-
-
-
- chrome://cookie/content/cookiePrefsOverlay.xul
-
-
-
- chrome://cookie/content/cookieNavigatorOverlay.xul
- chrome://cookie/content/cookieTasksOverlay.xul
-
-
-
- chrome://cookie/content/cookieContextOverlay.xul
-
-
-
diff --git a/extensions/cookie/resources/locale/en-US/contents.rdf.in b/extensions/cookie/resources/locale/en-US/contents.rdf.in
index ef99f51efd4..e69de29bb2d 100644
--- a/extensions/cookie/resources/locale/en-US/contents.rdf.in
+++ b/extensions/cookie/resources/locale/en-US/contents.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/help/resources/content/contents.rdf.in b/extensions/help/resources/content/contents.rdf.in
index d909eb4da2e..e69de29bb2d 100644
--- a/extensions/help/resources/content/contents.rdf.in
+++ b/extensions/help/resources/content/contents.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://help/content/helpMenuOverlay.xul
-
-
-
diff --git a/extensions/help/resources/locale/en-US/contents.rdf.in b/extensions/help/resources/locale/en-US/contents.rdf.in
index 676a08fd3c0..e69de29bb2d 100644
--- a/extensions/help/resources/locale/en-US/contents.rdf.in
+++ b/extensions/help/resources/locale/en-US/contents.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/inspector/resources/content/contents.rdf.in b/extensions/inspector/resources/content/contents.rdf.in
index 3436bfcdc21..e69de29bb2d 100644
--- a/extensions/inspector/resources/content/contents.rdf.in
+++ b/extensions/inspector/resources/content/contents.rdf.in
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://inspector/content/tasksOverlay.xul
-
-
-
- chrome://inspector/content/prefs/prefsOverlay.xul
-
-
-
-
-
- chrome://inspector/content/viewers/dom/commandOverlay.xul
- chrome://inspector/content/viewers/styleRules/commandOverlay.xul
- chrome://inspector/content/search/modules/commandOverlay.xul
-
-
-
- chrome://inspector/content/viewers/dom/keysetOverlay.xul
-
-
-
- chrome://inspector/content/viewers/dom/popupOverlay.xul
- chrome://inspector/content/viewers/styleRules/popupOverlay.xul
- chrome://inspector/content/search/modules/popupOverlay.xul
-
-
-
diff --git a/extensions/inspector/resources/locale/en-US/contents.rdf.in b/extensions/inspector/resources/locale/en-US/contents.rdf.in
index ab25397c37f..e69de29bb2d 100644
--- a/extensions/inspector/resources/locale/en-US/contents.rdf.in
+++ b/extensions/inspector/resources/locale/en-US/contents.rdf.in
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/irc/xul/content/contents.rdf.in b/extensions/irc/xul/content/contents.rdf.in
index 63e675c7e20..a5e67b6f576 100644
--- a/extensions/irc/xul/content/contents.rdf.in
+++ b/extensions/irc/xul/content/contents.rdf.in
@@ -13,7 +13,7 @@
chrome:author="mozilla.org"
chrome:authorURL="http://www.mozilla.org/projects/rt-messaging/chatzilla/"
chrome:description="A simple, straightforward Internet Relay Chat (IRC) client."
- chrome:localeVersion="@MOZILLA_VERSION@"
+ chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
chrome:extension="true"
chrome:name="chatzilla">
diff --git a/extensions/irc/xul/locale/en-US/contents.rdf.in b/extensions/irc/xul/locale/en-US/contents.rdf.in
index 53f4cf4ac7e..e69de29bb2d 100644
--- a/extensions/irc/xul/locale/en-US/contents.rdf.in
+++ b/extensions/irc/xul/locale/en-US/contents.rdf.in
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/p3p/resources/content/contents.rdf.in b/extensions/p3p/resources/content/contents.rdf.in
index 6114dfd8090..e69de29bb2d 100644
--- a/extensions/p3p/resources/content/contents.rdf.in
+++ b/extensions/p3p/resources/content/contents.rdf.in
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://p3p/content/pageInfoOverlay.xul
-
-
-
-
diff --git a/extensions/p3p/resources/locale/en-US/contents.rdf.in b/extensions/p3p/resources/locale/en-US/contents.rdf.in
index 2b7de4ab868..e69de29bb2d 100644
--- a/extensions/p3p/resources/locale/en-US/contents.rdf.in
+++ b/extensions/p3p/resources/locale/en-US/contents.rdf.in
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/pref/autoconfig/resources/content/contents.rdf.in b/extensions/pref/autoconfig/resources/content/contents.rdf.in
index a158f8ce1b8..e69de29bb2d 100644
--- a/extensions/pref/autoconfig/resources/content/contents.rdf.in
+++ b/extensions/pref/autoconfig/resources/content/contents.rdf.in
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/pref/autoconfig/resources/locale/en-US/contents.rdf.in b/extensions/pref/autoconfig/resources/locale/en-US/contents.rdf.in
index 214f30fd803..e69de29bb2d 100644
--- a/extensions/pref/autoconfig/resources/locale/en-US/contents.rdf.in
+++ b/extensions/pref/autoconfig/resources/locale/en-US/contents.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/transformiix/resources/buster/contents.rdf.in b/extensions/transformiix/resources/buster/contents.rdf.in
index 767af28f0b9..e69de29bb2d 100644
--- a/extensions/transformiix/resources/buster/contents.rdf.in
+++ b/extensions/transformiix/resources/buster/contents.rdf.in
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://xslt-qa/content/xslt-qa-overlay.xul
-
-
-
diff --git a/extensions/tridentprofile/resources/content/contents.rdf.in b/extensions/tridentprofile/resources/content/contents.rdf.in
index 601643eb187..e69de29bb2d 100644
--- a/extensions/tridentprofile/resources/content/contents.rdf.in
+++ b/extensions/tridentprofile/resources/content/contents.rdf.in
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://tridentprofile/content/tridentNavigatorOverlay.xul
-
-
-
diff --git a/extensions/tridentprofile/resources/locale/en-US/contents.rdf.in b/extensions/tridentprofile/resources/locale/en-US/contents.rdf.in
index 5ebef282c4c..e69de29bb2d 100644
--- a/extensions/tridentprofile/resources/locale/en-US/contents.rdf.in
+++ b/extensions/tridentprofile/resources/locale/en-US/contents.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/venkman/resources/content/contents.rdf.in b/extensions/venkman/resources/content/contents.rdf.in
index a3c46191a67..e69de29bb2d 100644
--- a/extensions/venkman/resources/content/contents.rdf.in
+++ b/extensions/venkman/resources/content/contents.rdf.in
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://venkman/content/venkman-overlay.xul
-
-
diff --git a/extensions/venkman/resources/locale/en-US/contents.rdf.in b/extensions/venkman/resources/locale/en-US/contents.rdf.in
index 2386296be6a..e69de29bb2d 100644
--- a/extensions/venkman/resources/locale/en-US/contents.rdf.in
+++ b/extensions/venkman/resources/locale/en-US/contents.rdf.in
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/wallet/resources/content/contents.rdf.in b/extensions/wallet/resources/content/contents.rdf.in
index 645df62acc1..e69de29bb2d 100644
--- a/extensions/wallet/resources/content/contents.rdf.in
+++ b/extensions/wallet/resources/content/contents.rdf.in
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://wallet/content/walletNavigatorOverlay.xul
-
-
-
- chrome://wallet/content/walletTasksOverlay.xul
-
-
-
- chrome://wallet/content/walletPrefsOverlay.xul
-
-
-
diff --git a/extensions/wallet/resources/locale/en-US/contents.rdf.in b/extensions/wallet/resources/locale/en-US/contents.rdf.in
index 7a5eb4a5270..e69de29bb2d 100644
--- a/extensions/wallet/resources/locale/en-US/contents.rdf.in
+++ b/extensions/wallet/resources/locale/en-US/contents.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/forms/resources/locale/en-US/contents.rdf.in b/layout/html/forms/resources/locale/en-US/contents.rdf.in
index 1f8bbe47d11..e69de29bb2d 100644
--- a/layout/html/forms/resources/locale/en-US/contents.rdf.in
+++ b/layout/html/forms/resources/locale/en-US/contents.rdf.in
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mail/base/content/contents.rdf.in b/mail/base/content/contents.rdf.in
index f88a9071b68..e69de29bb2d 100755
--- a/mail/base/content/contents.rdf.in
+++ b/mail/base/content/contents.rdf.in
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://messenger/content/mailPrefsOverlay.xul
-
-
-
-
- chrome://messenger/content/mailPrefsOverlay.xul
-
-
-
-
- chrome://messenger/content/mailPrefsOverlay.xul
-
-
-
-
- chrome://messenger/content/mailPrefsOverlay.xul
-
-
-
-
- chrome://messenger/content/mailMessengerOverlay.xul
-
-
- chrome://messenger/content/mailMessengerOverlay.xul
-
-
-
-
- chrome://messenger/content/mailOverlay.xul
-
-
-
diff --git a/mail/base/content/help.rdf.in b/mail/base/content/help.rdf.in
index e0add6fff20..e69de29bb2d 100755
--- a/mail/base/content/help.rdf.in
+++ b/mail/base/content/help.rdf.in
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/mail/base/content/messenger-views.rdf.in b/mail/base/content/messenger-views.rdf.in
index 7b850155b7b..e69de29bb2d 100755
--- a/mail/base/content/messenger-views.rdf.in
+++ b/mail/base/content/messenger-views.rdf.in
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mail/base/content/navigator.rdf.in b/mail/base/content/navigator.rdf.in
index 5be16a0e654..e69de29bb2d 100755
--- a/mail/base/content/navigator.rdf.in
+++ b/mail/base/content/navigator.rdf.in
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mail/extensions/inspector/content/contents.rdf.in b/mail/extensions/inspector/content/contents.rdf.in
index 52b660bf37e..e69de29bb2d 100755
--- a/mail/extensions/inspector/content/contents.rdf.in
+++ b/mail/extensions/inspector/content/contents.rdf.in
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://inspector/content/tasksOverlay.xul
-
-
-
- chrome://inspector/content/prefs/prefsOverlay.xul
-
-
-
-
-
- chrome://inspector/content/viewers/dom/commandOverlay.xul
- chrome://inspector/content/viewers/styleRules/commandOverlay.xul
- chrome://inspector/content/search/modules/commandOverlay.xul
-
-
-
- chrome://inspector/content/viewers/dom/keysetOverlay.xul
-
-
-
- chrome://inspector/content/viewers/dom/popupOverlay.xul
- chrome://inspector/content/viewers/styleRules/popupOverlay.xul
- chrome://inspector/content/search/modules/popupOverlay.xul
-
-
-
diff --git a/mail/extensions/offline/content/contents.rdf.in b/mail/extensions/offline/content/contents.rdf.in
index 3e74cdf7869..e69de29bb2d 100755
--- a/mail/extensions/offline/content/contents.rdf.in
+++ b/mail/extensions/offline/content/contents.rdf.in
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://messenger-offline/content/msgOfflineOverlay.xul
-
-
-
diff --git a/mail/extensions/offline/locale/contents.rdf.in b/mail/extensions/offline/locale/contents.rdf.in
index 16da49b056d..e69de29bb2d 100755
--- a/mail/extensions/offline/locale/contents.rdf.in
+++ b/mail/extensions/offline/locale/contents.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mailnews/base/resources/content/contents-region.rdf.in b/mailnews/base/resources/content/contents-region.rdf.in
index 1750d4b80e9..e69de29bb2d 100644
--- a/mailnews/base/resources/content/contents-region.rdf.in
+++ b/mailnews/base/resources/content/contents-region.rdf.in
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mailnews/base/resources/content/contents.rdf.in b/mailnews/base/resources/content/contents.rdf.in
index 6285f5ba893..e69de29bb2d 100644
--- a/mailnews/base/resources/content/contents.rdf.in
+++ b/mailnews/base/resources/content/contents.rdf.in
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://messenger/content/mailPrefsOverlay.xul
-
-
-
-
- chrome://messenger/content/mailPrefsOverlay.xul
-
-
-
-
- chrome://messenger/content/mailPrefsOverlay.xul
-
-
-
-
- chrome://messenger/content/mailPrefsOverlay.xul
-
-
-
-
- chrome://messenger/content/mailPrefsOverlay.xul
-
-
-
-
- chrome://messenger/content/mailTasksOverlay.xul
-
-
-
-
- chrome://messenger/content/mailOverlay.xul
-
-
-
-
- chrome://messenger/content/mailMessengerOverlay.xul
-
-
- chrome://messenger/content/mailMessengerOverlay.xul
-
-
-
-
- chrome://messenger/content/mailMessengerComposeOverlay.xul
-
-
-
-
- chrome://messenger/content/mailABOverlay.xul
-
-
-
-
- chrome://messenger/content/mailOverlay.xul
-
-
-
-
-
- chrome://messenger/content/mailEditorOverlay.xul
-
-
-
diff --git a/mailnews/base/resources/locale/en-US/contents-region.rdf.in b/mailnews/base/resources/locale/en-US/contents-region.rdf.in
index 13be1a23c3a..e69de29bb2d 100644
--- a/mailnews/base/resources/locale/en-US/contents-region.rdf.in
+++ b/mailnews/base/resources/locale/en-US/contents-region.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mailnews/base/resources/locale/en-US/contents.rdf.in b/mailnews/base/resources/locale/en-US/contents.rdf.in
index 02375b1f57d..e69de29bb2d 100644
--- a/mailnews/base/resources/locale/en-US/contents.rdf.in
+++ b/mailnews/base/resources/locale/en-US/contents.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mailnews/extensions/mailviews/resources/content/contents.rdf.in b/mailnews/extensions/mailviews/resources/content/contents.rdf.in
index b75b3b44c27..e69de29bb2d 100644
--- a/mailnews/extensions/mailviews/resources/content/contents.rdf.in
+++ b/mailnews/extensions/mailviews/resources/content/contents.rdf.in
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://messenger/content/msgViewPickerOverlay.xul
-
-
-
diff --git a/mailnews/extensions/mdn/resources/content/contents.rdf.in b/mailnews/extensions/mdn/resources/content/contents.rdf.in
index bc51c6d438d..e69de29bb2d 100644
--- a/mailnews/extensions/mdn/resources/content/contents.rdf.in
+++ b/mailnews/extensions/mdn/resources/content/contents.rdf.in
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mailnews/extensions/mdn/resources/locale/en-US/contents.rdf.in b/mailnews/extensions/mdn/resources/locale/en-US/contents.rdf.in
index 4dad1d98466..e69de29bb2d 100644
--- a/mailnews/extensions/mdn/resources/locale/en-US/contents.rdf.in
+++ b/mailnews/extensions/mdn/resources/locale/en-US/contents.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mailnews/extensions/smime/resources/content/contents.rdf.in b/mailnews/extensions/smime/resources/content/contents.rdf.in
index 1b081c27535..e69de29bb2d 100644
--- a/mailnews/extensions/smime/resources/content/contents.rdf.in
+++ b/mailnews/extensions/smime/resources/content/contents.rdf.in
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://messenger-smime/content/msgCompSMIMEOverlay.xul
-
-
-
- chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.xul
-
-
-
- chrome://messenger-smime/content/msgReadSMIMEOverlay.xul
-
-
-
- chrome://messenger-smime/content/msgReadSMIMEOverlay.xul
-
-
-
- chrome://messenger-smime/content/msgReadSMIMEOverlay.xul
-
-
diff --git a/mailnews/extensions/smime/resources/locale/en-US/contents.rdf.in b/mailnews/extensions/smime/resources/locale/en-US/contents.rdf.in
index d4d66c679c3..e69de29bb2d 100644
--- a/mailnews/extensions/smime/resources/locale/en-US/contents.rdf.in
+++ b/mailnews/extensions/smime/resources/locale/en-US/contents.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mailnews/extensions/smoketest/resources/content/contents.rdf.in b/mailnews/extensions/smoketest/resources/content/contents.rdf.in
index b44359e98f7..e69de29bb2d 100644
--- a/mailnews/extensions/smoketest/resources/content/contents.rdf.in
+++ b/mailnews/extensions/smoketest/resources/content/contents.rdf.in
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://messenger-smoketest/content/mailSmoketestOverlay.xul
-
-
-
diff --git a/mailnews/mapi/resources/content/contents.rdf.in b/mailnews/mapi/resources/content/contents.rdf.in
index f908c6f597e..e69de29bb2d 100644
--- a/mailnews/mapi/resources/content/contents.rdf.in
+++ b/mailnews/mapi/resources/content/contents.rdf.in
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://messenger-mapi/content/pref-mailnewsOverlay.xul
-
-
-
diff --git a/mailnews/mapi/resources/locale/en-US/contents.rdf.in b/mailnews/mapi/resources/locale/en-US/contents.rdf.in
index d54b711d3e4..e69de29bb2d 100644
--- a/mailnews/mapi/resources/locale/en-US/contents.rdf.in
+++ b/mailnews/mapi/resources/locale/en-US/contents.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/netwerk/resources/content/contents.rdf.in b/netwerk/resources/content/contents.rdf.in
index 4fbe3be7b2e..e69de29bb2d 100644
--- a/netwerk/resources/content/contents.rdf.in
+++ b/netwerk/resources/content/contents.rdf.in
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/netwerk/resources/locale/en-US/contents.rdf.in b/netwerk/resources/locale/en-US/contents.rdf.in
index 5657305ad64..e69de29bb2d 100644
--- a/netwerk/resources/locale/en-US/contents.rdf.in
+++ b/netwerk/resources/locale/en-US/contents.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/security/manager/pki/resources/content/contents.rdf.in b/security/manager/pki/resources/content/contents.rdf.in
index 7a965e40592..e69de29bb2d 100644
--- a/security/manager/pki/resources/content/contents.rdf.in
+++ b/security/manager/pki/resources/content/contents.rdf.in
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://pippki/content/PrefOverlay.xul
-
-
- chrome://pippki/content/PageInfoOverlay.xul
-
-
-
-
diff --git a/security/manager/pki/resources/locale/en-US/contents.rdf.in b/security/manager/pki/resources/locale/en-US/contents.rdf.in
index f3e703da0a2..e69de29bb2d 100644
--- a/security/manager/pki/resources/locale/en-US/contents.rdf.in
+++ b/security/manager/pki/resources/locale/en-US/contents.rdf.in
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/security/manager/ssl/resources/content/contents.rdf.in b/security/manager/ssl/resources/content/contents.rdf.in
index 647502dae8c..e69de29bb2d 100644
--- a/security/manager/ssl/resources/content/contents.rdf.in
+++ b/security/manager/ssl/resources/content/contents.rdf.in
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/security/manager/ssl/resources/locale/en-US/contents.rdf.in b/security/manager/ssl/resources/locale/en-US/contents.rdf.in
index 5b73952495f..e69de29bb2d 100644
--- a/security/manager/ssl/resources/locale/en-US/contents.rdf.in
+++ b/security/manager/ssl/resources/locale/en-US/contents.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/toolkit/components/passwordmgr/resources/content/contents.rdf.in b/toolkit/components/passwordmgr/resources/content/contents.rdf.in
index 314740eb4e9..e69de29bb2d 100755
--- a/toolkit/components/passwordmgr/resources/content/contents.rdf.in
+++ b/toolkit/components/passwordmgr/resources/content/contents.rdf.in
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/toolkit/components/passwordmgr/resources/locale/contents.rdf.in b/toolkit/components/passwordmgr/resources/locale/contents.rdf.in
index 8a068b07904..e69de29bb2d 100755
--- a/toolkit/components/passwordmgr/resources/locale/contents.rdf.in
+++ b/toolkit/components/passwordmgr/resources/locale/contents.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/toolkit/content/contents-platform.rdf.in b/toolkit/content/contents-platform.rdf.in
index 6bfbff78605..e69de29bb2d 100755
--- a/toolkit/content/contents-platform.rdf.in
+++ b/toolkit/content/contents-platform.rdf.in
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/toolkit/content/contents-region.rdf.in b/toolkit/content/contents-region.rdf.in
index e660d2e1dad..e69de29bb2d 100755
--- a/toolkit/content/contents-region.rdf.in
+++ b/toolkit/content/contents-region.rdf.in
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/toolkit/content/contents.rdf.in b/toolkit/content/contents.rdf.in
index a940cc4aa1d..e69de29bb2d 100755
--- a/toolkit/content/contents.rdf.in
+++ b/toolkit/content/contents.rdf.in
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/toolkit/locale/contents-platform.rdf.in b/toolkit/locale/contents-platform.rdf.in
index 4c50a50e059..e69de29bb2d 100755
--- a/toolkit/locale/contents-platform.rdf.in
+++ b/toolkit/locale/contents-platform.rdf.in
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/toolkit/locale/contents-region.rdf.in b/toolkit/locale/contents-region.rdf.in
index 9eced8e1582..c048c62994e 100755
--- a/toolkit/locale/contents-region.rdf.in
+++ b/toolkit/locale/contents-region.rdf.in
@@ -25,5 +25,5 @@
+ chrome:localeVersion="@MOZILLA_REGION_VERSION@"/>
diff --git a/toolkit/locale/contents.rdf.in b/toolkit/locale/contents.rdf.in
index 7a78f0f4676..570145374b3 100755
--- a/toolkit/locale/contents.rdf.in
+++ b/toolkit/locale/contents.rdf.in
@@ -24,5 +24,5 @@
+ chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
diff --git a/toolkit/mozapps/contents-content.rdf.in b/toolkit/mozapps/contents-content.rdf.in
index ebaa9a78de5..e69de29bb2d 100755
--- a/toolkit/mozapps/contents-content.rdf.in
+++ b/toolkit/mozapps/contents-content.rdf.in
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/toolkit/mozapps/contents-locale.rdf.in b/toolkit/mozapps/contents-locale.rdf.in
index 443ad95176c..e69de29bb2d 100755
--- a/toolkit/mozapps/contents-locale.rdf.in
+++ b/toolkit/mozapps/contents-locale.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/browser/resources/content/contents-region.rdf.in b/xpfe/browser/resources/content/contents-region.rdf.in
index 9d1ec36a7d2..e69de29bb2d 100644
--- a/xpfe/browser/resources/content/contents-region.rdf.in
+++ b/xpfe/browser/resources/content/contents-region.rdf.in
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/browser/resources/content/contents.rdf.in b/xpfe/browser/resources/content/contents.rdf.in
index 5be16a0e654..e69de29bb2d 100644
--- a/xpfe/browser/resources/content/contents.rdf.in
+++ b/xpfe/browser/resources/content/contents.rdf.in
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/browser/resources/content/mac/contents-platform.rdf.in b/xpfe/browser/resources/content/mac/contents-platform.rdf.in
index c578ca557ac..e69de29bb2d 100644
--- a/xpfe/browser/resources/content/mac/contents-platform.rdf.in
+++ b/xpfe/browser/resources/content/mac/contents-platform.rdf.in
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/browser/resources/content/unix/contents-platform.rdf.in b/xpfe/browser/resources/content/unix/contents-platform.rdf.in
index 06f2b747acd..e69de29bb2d 100644
--- a/xpfe/browser/resources/content/unix/contents-platform.rdf.in
+++ b/xpfe/browser/resources/content/unix/contents-platform.rdf.in
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/browser/resources/content/win/contents-platform.rdf.in b/xpfe/browser/resources/content/win/contents-platform.rdf.in
index 573426242a1..e69de29bb2d 100644
--- a/xpfe/browser/resources/content/win/contents-platform.rdf.in
+++ b/xpfe/browser/resources/content/win/contents-platform.rdf.in
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/browser/resources/locale/en-US/contents-region.rdf.in b/xpfe/browser/resources/locale/en-US/contents-region.rdf.in
index fdd8f945ba1..e69de29bb2d 100644
--- a/xpfe/browser/resources/locale/en-US/contents-region.rdf.in
+++ b/xpfe/browser/resources/locale/en-US/contents-region.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/browser/resources/locale/en-US/contents.rdf.in b/xpfe/browser/resources/locale/en-US/contents.rdf.in
index 9362f1e9251..e69de29bb2d 100644
--- a/xpfe/browser/resources/locale/en-US/contents.rdf.in
+++ b/xpfe/browser/resources/locale/en-US/contents.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/browser/resources/locale/en-US/mac/contents-platform.rdf.in b/xpfe/browser/resources/locale/en-US/mac/contents-platform.rdf.in
index c944435bb4f..e69de29bb2d 100644
--- a/xpfe/browser/resources/locale/en-US/mac/contents-platform.rdf.in
+++ b/xpfe/browser/resources/locale/en-US/mac/contents-platform.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf.in b/xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf.in
index c944435bb4f..e69de29bb2d 100644
--- a/xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf.in
+++ b/xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/browser/resources/locale/en-US/win/contents-platform.rdf.in b/xpfe/browser/resources/locale/en-US/win/contents-platform.rdf.in
index c944435bb4f..e69de29bb2d 100644
--- a/xpfe/browser/resources/locale/en-US/win/contents-platform.rdf.in
+++ b/xpfe/browser/resources/locale/en-US/win/contents-platform.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/communicator/resources/content/contents-platform.rdf.in b/xpfe/communicator/resources/content/contents-platform.rdf.in
index 65a8287f6b3..e69de29bb2d 100644
--- a/xpfe/communicator/resources/content/contents-platform.rdf.in
+++ b/xpfe/communicator/resources/content/contents-platform.rdf.in
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/communicator/resources/content/contents-region.rdf.in b/xpfe/communicator/resources/content/contents-region.rdf.in
index 5727696cbcf..e69de29bb2d 100644
--- a/xpfe/communicator/resources/content/contents-region.rdf.in
+++ b/xpfe/communicator/resources/content/contents-region.rdf.in
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/communicator/resources/content/contents.rdf.in b/xpfe/communicator/resources/content/contents.rdf.in
index 30ac0379b04..e69de29bb2d 100644
--- a/xpfe/communicator/resources/content/contents.rdf.in
+++ b/xpfe/communicator/resources/content/contents.rdf.in
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/communicator/resources/locale/en-US/contents-region.rdf.in b/xpfe/communicator/resources/locale/en-US/contents-region.rdf.in
index ce06c1681a6..e69de29bb2d 100644
--- a/xpfe/communicator/resources/locale/en-US/contents-region.rdf.in
+++ b/xpfe/communicator/resources/locale/en-US/contents-region.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/communicator/resources/locale/en-US/contents.rdf.in b/xpfe/communicator/resources/locale/en-US/contents.rdf.in
index 1c2b6c929bd..e69de29bb2d 100644
--- a/xpfe/communicator/resources/locale/en-US/contents.rdf.in
+++ b/xpfe/communicator/resources/locale/en-US/contents.rdf.in
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/communicator/resources/locale/en-US/mac/contents-platform.rdf.in b/xpfe/communicator/resources/locale/en-US/mac/contents-platform.rdf.in
index 95fdf87373d..e69de29bb2d 100644
--- a/xpfe/communicator/resources/locale/en-US/mac/contents-platform.rdf.in
+++ b/xpfe/communicator/resources/locale/en-US/mac/contents-platform.rdf.in
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/communicator/resources/locale/en-US/unix/contents-platform.rdf.in b/xpfe/communicator/resources/locale/en-US/unix/contents-platform.rdf.in
index 1695f844df7..e69de29bb2d 100644
--- a/xpfe/communicator/resources/locale/en-US/unix/contents-platform.rdf.in
+++ b/xpfe/communicator/resources/locale/en-US/unix/contents-platform.rdf.in
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/communicator/resources/locale/en-US/win/contents-platform.rdf.in b/xpfe/communicator/resources/locale/en-US/win/contents-platform.rdf.in
index 95fdf87373d..e69de29bb2d 100644
--- a/xpfe/communicator/resources/locale/en-US/win/contents-platform.rdf.in
+++ b/xpfe/communicator/resources/locale/en-US/win/contents-platform.rdf.in
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/components/autocomplete/resources/locale/en-US/contents.rdf.in b/xpfe/components/autocomplete/resources/locale/en-US/contents.rdf.in
index 79a2a93cf56..e69de29bb2d 100644
--- a/xpfe/components/autocomplete/resources/locale/en-US/contents.rdf.in
+++ b/xpfe/components/autocomplete/resources/locale/en-US/contents.rdf.in
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/components/download-manager/resources/mac/contents.rdf.in b/xpfe/components/download-manager/resources/mac/contents.rdf.in
index 54ae43ab618..e69de29bb2d 100644
--- a/xpfe/components/download-manager/resources/mac/contents.rdf.in
+++ b/xpfe/components/download-manager/resources/mac/contents.rdf.in
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://communicator/content/downloadmanager/dlmanagermenuoverlay.xul
-
-
-
diff --git a/xpfe/components/download-manager/resources/unix/contents.rdf.in b/xpfe/components/download-manager/resources/unix/contents.rdf.in
index 0186cf19b62..e69de29bb2d 100644
--- a/xpfe/components/download-manager/resources/unix/contents.rdf.in
+++ b/xpfe/components/download-manager/resources/unix/contents.rdf.in
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://communicator/content/tasksOverlay.xul
- chrome://communicator/content/utilityOverlay.xul
-
-
-
diff --git a/xpfe/components/download-manager/resources/win/contents.rdf.in b/xpfe/components/download-manager/resources/win/contents.rdf.in
index bf8e98e7c38..e69de29bb2d 100644
--- a/xpfe/components/download-manager/resources/win/contents.rdf.in
+++ b/xpfe/components/download-manager/resources/win/contents.rdf.in
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- chrome://communicator/content/tasksOverlay.xul
- chrome://communicator/content/utilityOverlay.xul
-
-
-
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/mac/contents-platform.rdf.in b/xpfe/components/prefwindow/resources/locale/en-US/mac/contents-platform.rdf.in
index 2aa82eee922..e69de29bb2d 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/mac/contents-platform.rdf.in
+++ b/xpfe/components/prefwindow/resources/locale/en-US/mac/contents-platform.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf.in b/xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf.in
index 2aa82eee922..e69de29bb2d 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf.in
+++ b/xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf.in b/xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf.in
index 2aa82eee922..e69de29bb2d 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf.in
+++ b/xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf.in
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/global/resources/content/contents-platform.rdf.in b/xpfe/global/resources/content/contents-platform.rdf.in
index 6bfbff78605..e69de29bb2d 100644
--- a/xpfe/global/resources/content/contents-platform.rdf.in
+++ b/xpfe/global/resources/content/contents-platform.rdf.in
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/global/resources/content/contents-region.rdf.in b/xpfe/global/resources/content/contents-region.rdf.in
index e660d2e1dad..e69de29bb2d 100644
--- a/xpfe/global/resources/content/contents-region.rdf.in
+++ b/xpfe/global/resources/content/contents-region.rdf.in
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/global/resources/content/contents.rdf.in b/xpfe/global/resources/content/contents.rdf.in
index a940cc4aa1d..e69de29bb2d 100644
--- a/xpfe/global/resources/content/contents.rdf.in
+++ b/xpfe/global/resources/content/contents.rdf.in
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/global/resources/locale/en-US/brand.dtd.in b/xpfe/global/resources/locale/en-US/brand.dtd.in
index fb06d3a81c6..e69de29bb2d 100644
--- a/xpfe/global/resources/locale/en-US/brand.dtd.in
+++ b/xpfe/global/resources/locale/en-US/brand.dtd.in
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/xpfe/global/resources/locale/en-US/contents-region.rdf.in b/xpfe/global/resources/locale/en-US/contents-region.rdf.in
index 94417067b05..e69de29bb2d 100644
--- a/xpfe/global/resources/locale/en-US/contents-region.rdf.in
+++ b/xpfe/global/resources/locale/en-US/contents-region.rdf.in
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/global/resources/locale/en-US/contents.rdf.in b/xpfe/global/resources/locale/en-US/contents.rdf.in
index 580295536e0..e69de29bb2d 100644
--- a/xpfe/global/resources/locale/en-US/contents.rdf.in
+++ b/xpfe/global/resources/locale/en-US/contents.rdf.in
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/global/resources/locale/en-US/mac/contents-platform.rdf.in b/xpfe/global/resources/locale/en-US/mac/contents-platform.rdf.in
index 6aef2fe3090..e69de29bb2d 100644
--- a/xpfe/global/resources/locale/en-US/mac/contents-platform.rdf.in
+++ b/xpfe/global/resources/locale/en-US/mac/contents-platform.rdf.in
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/global/resources/locale/en-US/os2/contents-platform.rdf.in b/xpfe/global/resources/locale/en-US/os2/contents-platform.rdf.in
index 6aef2fe3090..e69de29bb2d 100644
--- a/xpfe/global/resources/locale/en-US/os2/contents-platform.rdf.in
+++ b/xpfe/global/resources/locale/en-US/os2/contents-platform.rdf.in
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/global/resources/locale/en-US/region.dtd.in b/xpfe/global/resources/locale/en-US/region.dtd.in
index 9e47ed452a4..e69de29bb2d 100644
--- a/xpfe/global/resources/locale/en-US/region.dtd.in
+++ b/xpfe/global/resources/locale/en-US/region.dtd.in
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/xpfe/global/resources/locale/en-US/unix/contents-platform.rdf.in b/xpfe/global/resources/locale/en-US/unix/contents-platform.rdf.in
index 5ad342036c2..e69de29bb2d 100644
--- a/xpfe/global/resources/locale/en-US/unix/contents-platform.rdf.in
+++ b/xpfe/global/resources/locale/en-US/unix/contents-platform.rdf.in
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xpfe/global/resources/locale/en-US/win/contents-platform.rdf.in b/xpfe/global/resources/locale/en-US/win/contents-platform.rdf.in
index 6aef2fe3090..e69de29bb2d 100644
--- a/xpfe/global/resources/locale/en-US/win/contents-platform.rdf.in
+++ b/xpfe/global/resources/locale/en-US/win/contents-platform.rdf.in
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-