From f35f2c3708f7d3c8499390bab2f942173598aa45 Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org" <dbaron%dbaron.org>
Date: Tue, 2 Dec 2003 23:22:11 +0000
Subject: [PATCH] Separate locale version from Mozilla version so we do not
 have to bump locale version for every release.  b=226377  r=kairo, bsmedberg 
 sr=ben  a=asa

---
 .../inspector/content/contents.rdf.in         |  51 ---------
 client.mk                                     |   2 +
 config/chrome-versions.sh                     |   4 +
 configure                                     |   6 ++
 configure.in                                  |   4 +
 .../base/resources/content/contents.rdf.in    |  19 ----
 .../resources/locale/en-US/contents.rdf.in    |  24 -----
 .../composer/content/contents-region.rdf.in   |  17 ---
 editor/ui/composer/content/contents.rdf.in    |  55 ----------
 .../locale/en-US/contents-region.rdf.in       |  26 -----
 .../ui/composer/locale/en-US/contents.rdf.in  |  23 ----
 .../resources/content/contents.rdf.in         |  26 -----
 .../resources/locale/en-US/contents.rdf.in    |  28 -----
 .../cookie/resources/content/contents.rdf.in  |  43 --------
 .../resources/locale/en-US/contents.rdf.in    |  26 -----
 .../help/resources/content/contents.rdf.in    |  26 -----
 .../resources/locale/en-US/contents.rdf.in    |  23 ----
 .../resources/content/contents.rdf.in         |  56 ----------
 .../resources/locale/en-US/contents.rdf.in    |  21 ----
 extensions/irc/xul/content/contents.rdf.in    |   2 +-
 .../irc/xul/locale/en-US/contents.rdf.in      |  28 -----
 .../p3p/resources/content/contents.rdf.in     |  61 -----------
 .../resources/locale/en-US/contents.rdf.in    |  59 ----------
 .../resources/content/contents.rdf.in         |  18 ----
 .../resources/locale/en-US/contents.rdf.in    |  23 ----
 .../resources/buster/contents.rdf.in          |  28 -----
 .../resources/content/contents.rdf.in         |  27 -----
 .../resources/locale/en-US/contents.rdf.in    |  23 ----
 .../venkman/resources/content/contents.rdf.in |  63 -----------
 .../resources/locale/en-US/contents.rdf.in    |  65 -----------
 .../wallet/resources/content/contents.rdf.in  |  37 -------
 .../resources/locale/en-US/contents.rdf.in    |  26 -----
 .../resources/locale/en-US/contents.rdf.in    |  61 -----------
 mail/base/content/contents.rdf.in             |  65 -----------
 mail/base/content/help.rdf.in                 |  15 ---
 mail/base/content/messenger-views.rdf.in      |  16 ---
 mail/base/content/navigator.rdf.in            |  20 ----
 .../inspector/content/contents.rdf.in         |  56 ----------
 .../offline/content/contents.rdf.in           |  33 ------
 .../extensions/offline/locale/contents.rdf.in |  23 ----
 .../resources/content/contents-region.rdf.in  |  17 ---
 .../base/resources/content/contents.rdf.in    | 102 ------------------
 .../locale/en-US/contents-region.rdf.in       |  26 -----
 .../resources/locale/en-US/contents.rdf.in    |  23 ----
 .../resources/content/contents.rdf.in         |  29 -----
 .../mdn/resources/content/contents.rdf.in     |  20 ----
 .../resources/locale/en-US/contents.rdf.in    |  23 ----
 .../smime/resources/content/contents.rdf.in   |  48 ---------
 .../resources/locale/en-US/contents.rdf.in    |  23 ----
 .../resources/content/contents.rdf.in         |  29 -----
 .../mapi/resources/content/contents.rdf.in    |  30 ------
 .../resources/locale/en-US/contents.rdf.in    |  23 ----
 netwerk/resources/content/contents.rdf.in     |  19 ----
 .../resources/locale/en-US/contents.rdf.in    |  23 ----
 .../pki/resources/content/contents.rdf.in     |  55 ----------
 .../resources/locale/en-US/contents.rdf.in    |  48 ---------
 .../ssl/resources/content/contents.rdf.in     |  18 ----
 .../resources/locale/en-US/contents.rdf.in    |  26 -----
 .../resources/content/contents.rdf.in         |  18 ----
 .../resources/locale/contents.rdf.in          |  26 -----
 toolkit/content/contents-platform.rdf.in      |  17 ---
 toolkit/content/contents-region.rdf.in        |  18 ----
 toolkit/content/contents.rdf.in               |  18 ----
 toolkit/locale/contents-platform.rdf.in       |  24 -----
 toolkit/locale/contents-region.rdf.in         |   2 +-
 toolkit/locale/contents.rdf.in                |   2 +-
 toolkit/mozapps/contents-content.rdf.in       |  19 ----
 toolkit/mozapps/contents-locale.rdf.in        |  23 ----
 .../resources/content/contents-region.rdf.in  |  17 ---
 .../browser/resources/content/contents.rdf.in |  20 ----
 .../content/mac/contents-platform.rdf.in      |  17 ---
 .../content/unix/contents-platform.rdf.in     |  17 ---
 .../content/win/contents-platform.rdf.in      |  17 ---
 .../locale/en-US/contents-region.rdf.in       |  26 -----
 .../resources/locale/en-US/contents.rdf.in    |  23 ----
 .../locale/en-US/mac/contents-platform.rdf.in |  26 -----
 .../en-US/unix/contents-platform.rdf.in       |  26 -----
 .../locale/en-US/win/contents-platform.rdf.in |  26 -----
 .../content/contents-platform.rdf.in          |  17 ---
 .../resources/content/contents-region.rdf.in  |  17 ---
 .../resources/content/contents.rdf.in         |  20 ----
 .../locale/en-US/contents-region.rdf.in       |  26 -----
 .../resources/locale/en-US/contents.rdf.in    |  23 ----
 .../locale/en-US/mac/contents-platform.rdf.in |  24 -----
 .../en-US/unix/contents-platform.rdf.in       |  24 -----
 .../locale/en-US/win/contents-platform.rdf.in |  24 -----
 .../resources/locale/en-US/contents.rdf.in    |  59 ----------
 .../resources/mac/contents.rdf.in             |  27 -----
 .../resources/unix/contents.rdf.in            |  28 -----
 .../resources/win/contents.rdf.in             |  28 -----
 .../locale/en-US/mac/contents-platform.rdf.in |  26 -----
 .../en-US/unix/contents-platform.rdf.in       |  26 -----
 .../locale/en-US/win/contents-platform.rdf.in |  26 -----
 .../content/contents-platform.rdf.in          |  17 ---
 .../resources/content/contents-region.rdf.in  |  18 ----
 xpfe/global/resources/content/contents.rdf.in |  18 ----
 .../resources/locale/en-US/brand.dtd.in       |   4 -
 .../locale/en-US/contents-region.rdf.in       |  29 -----
 .../resources/locale/en-US/contents.rdf.in    |  28 -----
 .../locale/en-US/mac/contents-platform.rdf.in |  24 -----
 .../locale/en-US/os2/contents-platform.rdf.in |  24 -----
 .../resources/locale/en-US/region.dtd.in      |   5 -
 .../en-US/unix/contents-platform.rdf.in       |  24 -----
 .../locale/en-US/win/contents-platform.rdf.in |  24 -----
 104 files changed, 19 insertions(+), 2784 deletions(-)
 create mode 100644 config/chrome-versions.sh

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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:inspector"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:inspector"
-        chrome:displayName="Document Inspector"
-        chrome:author="Joe Hewitt"
-        chrome:name="inspector"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://browser/content/browser.xul"/>
-    <RDF:li resource="chrome://inspector/content/commandOverlay.xul"/>
-    <RDF:li resource="chrome://inspector/content/keysetOverlay.xul"/>
-    <RDF:li resource="chrome://inspector/content/popupOverlay.xul"/>
-  </RDF:Seq>
-
-  <!-- mozilla/mail Overlays -->
-
-  <RDF:Seq about="chrome://browser/content/browser.xul">
-    <RDF:li>chrome://inspector/content/tasksOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- Inspector Overlays -->
-
-  <RDF:Seq about="chrome://inspector/content/commandOverlay.xul">
-    <RDF:li>chrome://inspector/content/viewers/dom/commandOverlay.xul</RDF:li>
-    <RDF:li>chrome://inspector/content/viewers/styleRules/commandOverlay.xul</RDF:li>
-    <RDF:li>chrome://inspector/content/search/modules/commandOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://inspector/content/keysetOverlay.xul">
-    <RDF:li>chrome://inspector/content/viewers/dom/keysetOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://inspector/content/popupOverlay.xul">
-    <RDF:li>chrome://inspector/content/viewers/dom/popupOverlay.xul</RDF:li>
-    <RDF:li>chrome://inspector/content/viewers/styleRules/popupOverlay.xul</RDF:li>
-    <RDF:li>chrome://inspector/content/search/modules/popupOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:mozldap"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:mozldap"
-        chrome:displayName="MozLDAP"
-        chrome:author="mozilla.org"
-        chrome:name="mozldap"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-</RDF:RDF>
-
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 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locales being supplied -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:mozldap"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:mozldap"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:editor-region"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:editor-region"
-        chrome:author="mozilla.org"
-        chrome:name="editor-region"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:editor"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:editor"
-        chrome:displayName="Editor"
-        chrome:author="mozilla.org"
-        chrome:name="editor"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-  
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/pref-appearance.xul"/>
-    <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
-    <RDF:li resource="chrome://messenger/content/mailWindowOverlay.xul"/>
-  </RDF:Seq>
-
-  <!-- editor tasks overlay -->
-  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
-    <RDF:li>chrome://editor/content/editorTasksOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- editor preferences branches -->
-  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://editor/content/editorPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- editor startup pref -->
-  <RDF:Seq about="chrome://communicator/content/pref/pref-appearance.xul">
-    <RDF:li>chrome://editor/content/editorPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- editor items for Navigator -->
-  <RDF:Seq about="chrome://navigator/content/navigatorOverlay.xul">
-    <RDF:li>chrome://editor/content/editorNavigatorOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- editor items for Mail -->
-  <RDF:Seq about="chrome://messenger/content/mailWindowOverlay.xul">
-    <RDF:li>chrome://editor/content/editorMailOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-
-</RDF:RDF>
-
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:US"
-        chrome:author="mozilla.org"
-        chrome:name="US"
-        chrome:previewURL="http://www.mozilla.org/locales/US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:US:packages">
-        <RDF:li resource="urn:mozilla:locale:US:editor-region"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:US:editor-region"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:editor"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:editor"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:content-packs"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:content-packs"
-        chrome:displayName="Content Pack Switching"
-        chrome:author="mozilla.org"
-        chrome:name="content-packs"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://content-packs/content/prefOverlay.xul</RDF:li>
-  </RDF:Seq>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locales being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:displayName="English (US)"
-        chrome:author="mozilla.org"
-        chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:content-packs"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:content-packs"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
-
-
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:cookie"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:cookie"
-        chrome:displayName="Cookie Manager"
-        chrome:author="mozilla.org"
-        chrome:name="cookie"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/contentAreaContextOverlay.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
-    <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
-    <RDF:li resource="chrome://messenger/content/mailWindowOverlay.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/contentAreaContextOverlay.xul">
-    <RDF:li>chrome://cookie/content/cookieContextOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://cookie/content/cookiePrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-  
-  <RDF:Seq about="chrome://navigator/content/navigatorOverlay.xul">
-    <RDF:li>chrome://cookie/content/cookieNavigatorOverlay.xul</RDF:li>
-    <RDF:li>chrome://cookie/content/cookieTasksOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://messenger/content/mailWindowOverlay.xul">
-    <RDF:li>chrome://cookie/content/cookieContextOverlay.xul</RDF:li>
-  </RDF:Seq>
-  
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-                   chrome:displayName="English (US)"
-                   chrome:author="mozilla.org"
-                   chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:cookie"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:cookie"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:help"/>
-  </RDF:Seq>
-
-  <RDF:Description about="urn:mozilla:package:help"
-        chrome:displayName="Mozilla Help Viewer"
-        chrome:author="netscape.com"
-        chrome:name="help"
-        chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description> 
-
-  <!-- Declare overlay points used in this package -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/utilityOverlay.xul"/>
-  </RDF:Seq>
-
-  <!-- Define the local overlay file(s) for each overlay point -->
-  <RDF:Seq about="chrome://communicator/content/utilityOverlay.xul">
-    <RDF:li>chrome://help/content/helpMenuOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:help"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:help"
-   chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:inspector"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:inspector"
-        chrome:displayName="Document Inspector"
-        chrome:author="Joe Hewitt"
-        chrome:name="inspector"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
-    <RDF:li resource="chrome://inspector/content/commandOverlay.xul"/>
-    <RDF:li resource="chrome://inspector/content/keysetOverlay.xul"/>
-    <RDF:li resource="chrome://inspector/content/popupOverlay.xul"/>
-  </RDF:Seq>
-
-  <!-- Communicator Overlays -->
-
-  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
-    <RDF:li>chrome://inspector/content/tasksOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://inspector/content/prefs/prefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- Inspector Overlays -->
-
-  <RDF:Seq about="chrome://inspector/content/commandOverlay.xul">
-    <RDF:li>chrome://inspector/content/viewers/dom/commandOverlay.xul</RDF:li>
-    <RDF:li>chrome://inspector/content/viewers/styleRules/commandOverlay.xul</RDF:li>
-    <RDF:li>chrome://inspector/content/search/modules/commandOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://inspector/content/keysetOverlay.xul">
-    <RDF:li>chrome://inspector/content/viewers/dom/keysetOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://inspector/content/popupOverlay.xul">
-    <RDF:li>chrome://inspector/content/viewers/dom/popupOverlay.xul</RDF:li>
-    <RDF:li>chrome://inspector/content/viewers/styleRules/popupOverlay.xul</RDF:li>
-    <RDF:li>chrome://inspector/content/search/modules/popupOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:inspector"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <RDF:Description about="urn:mozilla:locale:en-US:inspector"
-	                 chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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">
   </RDF:Description>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:displayName="English(US)"
-        chrome:author="mozilla.org"
-        chrome:name="en-US"
-        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:chatzilla"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:chatzilla"
-       chrome:localeVersion="@MOZILLA_VERSION@"/>
-
-</RDF:RDF>
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 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is the Platform for Privacy Preferences.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2002
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s): Samir Gehani <sgehani@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:p3p"/>
-  </RDF:Seq>
-
-  <RDF:Description about="urn:mozilla:package:p3p"
-    chrome:displayName="Platform for Privacy Preferences Project"
-    chrome:author="Netscape Communications Corporation"
-    chrome:name="p3p"
-    chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://navigator/content/pageInfo.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://navigator/content/pageInfo.xul">
-    <RDF:li>chrome://p3p/content/pageInfoOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
-
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 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is the Platform for Privacy Preferences.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2002
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s): Samir Gehani <sgehani@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <RDF:Description about="urn:mozilla:locale:en-US"
-                   chrome:displayName="English (US)"
-                   chrome:author="mozilla.org"
-                   chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:p3p"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <RDF:Description about="urn:mozilla:locale:en-US:p3p"
-    chrome:localeVersion="@MOZILLA_VERSION@"/>
-
-</RDF:RDF>
-
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:autoconfig"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:autoconfig"
-        chrome:displayName="AutoConfig"
-        chrome:author="mozilla.org"
-        chrome:name="autoconfig"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locales being supplied -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:autoconfig"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:autoconfig"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:xslt-qa"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:xslt-qa"
-        chrome:displayName="XSLT QA Tools"
-        chrome:author="mozilla.org"
-        chrome:name="xslt-qa"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
-    <RDF:li>chrome://xslt-qa/content/xslt-qa-overlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:tridentprofile"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:tridentprofile"
-        chrome:displayName="Profile Migrator"
-        chrome:author="mozilla.org"
-        chrome:name="profile"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://navigator/content/navigatorOverlay.xul">
-    <RDF:li>chrome://tridentprofile/content/tridentNavigatorOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locales being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:tridentprofile"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:tridentprofile"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<!--
-   -
-   - The contents of this file are subject to the Mozilla Public License
-   - Version 1.1 (the "License"); you may not use this file except in
-   - compliance with the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/ 
-   - 
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License. 
-   -
-   - The Original Code is The JavaScript Debugger
-   - 
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation
-   - Portions created by Netscape are
-   - Copyright (C) 1998 Netscape Communications Corporation.
-   - All Rights Reserved.
-   -
-   - Alternatively, the contents of this file may be used under the
-   - terms of the GNU Public License (the "GPL"), in which case the
-   - provisions of the GPL are applicable instead of those above.
-   - If you wish to allow use of your version of this file only
-   - under the terms of the GPL and not to allow others to use your
-   - version of this file under the MPL, indicate your decision by
-   - deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL.  If you do not delete
-   - the provisions above, a recipient may use your version of this
-   - file under either the MPL or the GPL.
-   -
-   - Contributor(s):
-   -  Robert Ginda, <rginda@netscape.com>, original author
-   -
-   -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:venkman"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:venkman"
-        chrome:displayName="JavaScript Debugger"
-        chrome:author="mozilla.org"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:name="venkman">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
-    <RDF:li>chrome://venkman/content/venkman-overlay.xul</RDF:li>
-  </RDF:Seq>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<!--
-   -
-   - The contents of this file are subject to the Mozilla Public License
-   - Version 1.1 (the "License"); you may not use this file except in
-   - compliance with the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/ 
-   - 
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License. 
-   -
-   - The Original Code is The JavaScript Debugger
-   - 
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation
-   - Portions created by Netscape are
-   - Copyright (C) 1998 Netscape Communications Corporation.
-   - All Rights Reserved.
-   -
-   - Alternatively, the contents of this file may be used under the
-   - terms of the GNU Public License (the "GPL"), in which case the
-   - provisions of the GPL are applicable instead of those above.
-   - If you wish to allow use of your version of this file only
-   - under the terms of the GPL and not to allow others to use your
-   - version of this file under the MPL, indicate your decision by
-   - deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL.  If you do not delete
-   - the provisions above, a recipient may use your version of this
-   - file under either the MPL or the GPL.
-   -
-   - Contributor(s):
-   -  Robert Ginda, <rginda@netscape.com>, original author
-   -
-   -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:displayName="English(US)"
-        chrome:author="app_author"
-        chrome:name="en-US"
-        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:venkman"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:venkman"
-       chrome:localeVersion="@MOZILLA_VERSION@"/>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:wallet"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:wallet"
-        chrome:displayName="Form Manager"
-        chrome:author="mozilla.org"
-        chrome:name="wallet"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://navigator/content/navigator.xul"/>
-    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://navigator/content/navigator.xul">
-    <RDF:li>chrome://wallet/content/walletNavigatorOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
-    <RDF:li>chrome://wallet/content/walletTasksOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://wallet/content/walletPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-                   chrome:displayName="English (US)"
-                   chrome:author="mozilla.org"
-                   chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:wallet"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:wallet"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -  Brian Ryner <bryner@brianryner.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-<RDF:Seq about="urn:mozilla:locale:root">
-<RDF:li resource="urn:mozilla:locale:en-US"/>
-</RDF:Seq>
-
-<RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:displayName="English(US)"
-        chrome:author="mozilla.org"
-        chrome:name="en-US">
-  <chrome:packages>
-    <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-      <RDF:li resource="urn:mozilla:locale:en-US:forms"/>
-    </RDF:Seq>
-  </chrome:packages>
-</RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:forms"
-        chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger"
-        chrome:displayName="Messenger"
-        chrome:author="mozilla.org"
-        chrome:name="messenger"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/pref/pref-appearance.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/pref-scripts.xul"/>
-    <RDF:li resource="chrome://cookie/content/pref-cookies.xul"/>
-    <RDF:li resource="chrome://cookie/content/pref-images.xul"/>
-    <RDF:li resource="chrome://messenger/content/messenger.xul"/>
-    <RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
-    <RDF:li resource="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul"/>
-  </RDF:Seq>
-
-
-  <!-- messenger startup pref -->
-  <RDF:Seq about="chrome://communicator/content/pref/pref-appearance.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger js toggle pref -->
-  <RDF:Seq about="chrome://communicator/content/pref/pref-scripts.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger cookie toggle pref -->
-  <RDF:Seq about="chrome://cookie/content/pref-cookies.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger image toggle pref -->
-  <RDF:Seq about="chrome://cookie/content/pref-images.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger items for Messenger -->
-  <RDF:Seq about="chrome://messenger/content/messenger.xul">
-    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
-  </RDF:Seq>
-  <RDF:Seq about="chrome://messenger/content/mail3PaneWindowVertLayout.xul">
-    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
-  </RDF:Seq>
-  
-  <!-- messenger items for Select Addresses dialog -->
-  <RDF:Seq about="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul">
-    <RDF:li>chrome://messenger/content/mailOverlay.xul</RDF:li>
-  </RDF:Seq>
-  
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:help"/>
-  </RDF:Seq>
-
-  <RDF:Description about="urn:mozilla:package:help"
-        chrome:displayName="Mozilla Help Viewer"
-        chrome:author="netscape.com"
-        chrome:name="help"
-        chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description> 
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger-views"/>
-  </RDF:Seq>
-
-  <RDF:Description about="urn:mozilla:package:messenger-views"
-        chrome:displayName="Messenger"
-        chrome:author="mozilla.org"
-        chrome:name="messenger-views"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-</RDF:RDF>
\ 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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:navigator"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:navigator"
-        chrome:displayName="Navigator"
-        chrome:author="mozilla.org"
-        chrome:name="navigator"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-</RDF:RDF>
-
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:inspector"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:inspector"
-        chrome:displayName="Document Inspector"
-        chrome:author="Joe Hewitt"
-        chrome:name="inspector"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://messenger/content/mailWindowOverlay.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
-    <RDF:li resource="chrome://inspector/content/commandOverlay.xul"/>
-    <RDF:li resource="chrome://inspector/content/keysetOverlay.xul"/>
-    <RDF:li resource="chrome://inspector/content/popupOverlay.xul"/>
-  </RDF:Seq>
-
-  <!-- mozilla/mail Overlays -->
-
-  <RDF:Seq about="chrome://messenger/content/mailWindowOverlay.xul">
-    <RDF:li>chrome://inspector/content/tasksOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://inspector/content/prefs/prefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- Inspector Overlays -->
-
-  <RDF:Seq about="chrome://inspector/content/commandOverlay.xul">
-    <RDF:li>chrome://inspector/content/viewers/dom/commandOverlay.xul</RDF:li>
-    <RDF:li>chrome://inspector/content/viewers/styleRules/commandOverlay.xul</RDF:li>
-    <RDF:li>chrome://inspector/content/search/modules/commandOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://inspector/content/keysetOverlay.xul">
-    <RDF:li>chrome://inspector/content/viewers/dom/keysetOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://inspector/content/popupOverlay.xul">
-    <RDF:li>chrome://inspector/content/viewers/dom/popupOverlay.xul</RDF:li>
-    <RDF:li>chrome://inspector/content/viewers/styleRules/popupOverlay.xul</RDF:li>
-    <RDF:li>chrome://inspector/content/search/modules/popupOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger-offline"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger-offline"
-        chrome:displayName="Offline Support"
-        chrome:author="Team Thunderbird"
-        chrome:authorURL="http://www.mozilla.org/projects/thunderbird/specs/offline.html"
-        chrome:name="messenger-offline"
-        chrome:description="This extension adds offline support to Mozilla Thunderbird." 
-        chrome:extension="true"
-        chrome:settingsURL="chrome://messenger-offline/content/pref-offline.xul"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://messenger/content/mailWindowOverlay.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://messenger/content/mailWindowOverlay.xul">
-    <RDF:li>chrome://messenger-offline/content/msgOfflineOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:messenger-offline"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:messenger-offline"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger-region"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger-region"
-        chrome:author="mozilla.org"
-        chrome:name="messenger-region"
-	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger"
-        chrome:displayName="Messenger"
-        chrome:author="mozilla.org"
-        chrome:name="messenger"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/pref-appearance.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/pref-scripts.xul"/>
-    <RDF:li resource="chrome://cookie/content/pref-cookies.xul"/>
-    <RDF:li resource="chrome://cookie/content/pref-images.xul"/>
-    <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
-    <RDF:li resource="chrome://messenger/content/messenger.xul"/>
-    <RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
-    <RDF:li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/>
-    <RDF:li resource="chrome://messenger/content/addressbook/addressbook.xul"/>
-    <RDF:li resource="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul"/>
-    <RDF:li resource="chrome://editor/content/editor.xul"/>
-    <RDF:li resource="chrome://editor/content/editorTasksOverlay.xul"/>
-  </RDF:Seq>
-
-
-  <!-- messenger preferences branches -->
-  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger startup pref -->
-  <RDF:Seq about="chrome://communicator/content/pref/pref-appearance.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger js toggle pref -->
-  <RDF:Seq about="chrome://communicator/content/pref/pref-scripts.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger cookie toggle pref -->
-  <RDF:Seq about="chrome://cookie/content/pref-cookies.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger image toggle pref -->
-  <RDF:Seq about="chrome://cookie/content/pref-images.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger taskbar/tasks menu items -->
-  <RDF:Seq about="chrome://editor/content/editorTasksOverlay.xul">
-    <RDF:li>chrome://messenger/content/mailTasksOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger items for Navigator -->
-  <RDF:Seq about="chrome://navigator/content/navigatorOverlay.xul">
-    <RDF:li>chrome://messenger/content/mailOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger items for Messenger -->
-  <RDF:Seq about="chrome://messenger/content/messenger.xul">
-    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
-  </RDF:Seq>
-  <RDF:Seq about="chrome://messenger/content/mail3PaneWindowVertLayout.xul">
-    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger items for Mail Compose -->
-  <RDF:Seq about="chrome://messenger/content/messengercompose/messengercompose.xul">
-    <RDF:li>chrome://messenger/content/mailMessengerComposeOverlay.xul</RDF:li>
-  </RDF:Seq>
-  
-  <!-- messenger items for Addressbook -->
-  <RDF:Seq about="chrome://messenger/content/addressbook/addressbook.xul">
-    <RDF:li>chrome://messenger/content/mailABOverlay.xul</RDF:li>
-  </RDF:Seq>
-  
-  <!-- messenger items for Select Addresses dialog -->
-  <RDF:Seq about="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul">
-    <RDF:li>chrome://messenger/content/mailOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-
-  <!-- messenger items for Composer -->
-  <RDF:Seq about="chrome://editor/content/editor.xul">
-    <RDF:li>chrome://messenger/content/mailEditorOverlay.xul</RDF:li>
-  </RDF:Seq>
-  
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:US"
-        chrome:author="mozilla.org"
-        chrome:name="US"
-        chrome:previewURL="http://www.mozilla.org/locales/US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:US:packages">
-        <RDF:li resource="urn:mozilla:locale:US:messenger-region"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:US:messenger-region"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:messenger"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:messenger"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger-views"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger-views"
-        chrome:displayName="Messenger"
-        chrome:author="mozilla.org"
-        chrome:name="messenger-views"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://messenger/content/mailWindowOverlay.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://messenger/content/mailWindowOverlay.xul">
-    <RDF:li>chrome://messenger/content/msgViewPickerOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger-mdn"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger-mdn"
-        chrome:displayName="Messenger"
-        chrome:author="mozilla.org"
-        chrome:name="messenger-mdn"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:messenger-mdn"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:messenger-mdn"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger-smime"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger-smime"
-        chrome:displayName="Messenger"
-        chrome:author="mozilla.org"
-        chrome:name="messenger-smime"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/>
-    <RDF:li resource="chrome://messenger/content/msgHdrViewOverlay.xul"/>
-    <RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
-    <RDF:li resource="chrome://messenger/content/messenger.xul"/>
-    <RDF:li resource="chrome://messenger/content/messageWindow.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://messenger/content/messengercompose/messengercompose.xul">
-    <RDF:li>chrome://messenger-smime/content/msgCompSMIMEOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://messenger/content/msgHdrViewOverlay.xul">
-    <RDF:li>chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://messenger/content/mail3PaneWindowVertLayout.xul">
-    <RDF:li>chrome://messenger-smime/content/msgReadSMIMEOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://messenger/content/messenger.xul">
-    <RDF:li>chrome://messenger-smime/content/msgReadSMIMEOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://messenger/content/messageWindow.xul">
-    <RDF:li>chrome://messenger-smime/content/msgReadSMIMEOverlay.xul</RDF:li>
-  </RDF:Seq>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:messenger-smime"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:messenger-smime"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://chrome.mozilla.org/rdf#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger-smoketest"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger-smoketest"
-        chrome:displayName="Messenger"
-        chrome:author="mozilla.org"
-        chrome:name="messenger-smoketest"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://messenger/content/mailWindowOverlay.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://messenger/content/mailWindowOverlay.xul">
-    <RDF:li>chrome://messenger-smoketest/content/mailSmoketestOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger-mapi"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger-mapi"
-        chrome:displayName="Messenger"
-        chrome:author="mozilla.org"
-        chrome:name="messenger-mapi"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
-  </RDF:Seq>
-  
-  <!-- mapi items for Mail And Newsgroups preferences pane -->
-  <RDF:Seq about="chrome://messenger/content/pref-mailnews.xul">
-    <RDF:li>chrome://messenger-mapi/content/pref-mailnewsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:messenger-mapi"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:messenger-mapi"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:necko"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:necko"
-        chrome:displayName="Necko"
-        chrome:author="mozilla.org"
-        chrome:name="necko"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-</RDF:RDF>
-
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locales being supplied -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:necko"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:necko"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<!-- 
-   - The contents of this file are subject to the Mozilla Public
-   - License Version 1.1 (the "License"); you may not use this file
-   - except in compliance with the License. You may obtain a copy of
-   - the License at http://www.mozilla.org/MPL/
-   - 
-   - Software distributed under the License is distributed on an "AS
-   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-   - implied. See the License for the specific language governing
-   - rights and limitations under the License.
-   - 
-   - The Original Code is mozilla.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-  -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:pippki"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:pippki"
-        chrome:displayName="pippki"
-        chrome:author="PSM Team"
-        chrome:name="pippki"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-  <!-- Declare overlay points used in this package -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
-    <RDF:li resource="chrome://navigator/content/pageInfo.xul"/>
-  </RDF:Seq>
-
-  <!-- Define the local overlay file(s) for each overlay point -->
-  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://pippki/content/PrefOverlay.xul</RDF:li>
-  </RDF:Seq>
-  <RDF:Seq about="chrome://navigator/content/pageInfo.xul">
-    <RDF:li>chrome://pippki/content/PageInfoOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>  
-
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 @@
-<?xml version="1.0"?>
-<!-- 
-   - The contents of this file are subject to the Mozilla Public
-   - License Version 1.1 (the "License"); you may not use this file
-   - except in compliance with the License. You may obtain a copy of
-   - the License at http://www.mozilla.org/MPL/
-   - 
-   - Software distributed under the License is distributed on an "AS
-   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-   - implied. See the License for the specific language governing
-   - rights and limitations under the License.
-   - 
-   - The Original Code is mozilla.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-  -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locales being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:displayName="English (US)"
-        chrome:author="PSM Team"
-        chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:pippki"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:pippki"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:pipnss"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:pipnss"
-        chrome:displayName="pipnss"
-        chrome:author="PSM Team"
-        chrome:name="pipnss"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-</RDF:RDF>  
-
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locales being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:displayName="English (US)"
-        chrome:author="PSM Team"
-        chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:pipnss"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:pipnss"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:passwordmgr"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:passwordmgr"
-        chrome:displayName="Password Manager"
-        chrome:author="mozilla.org"
-        chrome:name="passwordmgr"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-                   chrome:displayName="English (US)"
-                   chrome:author="mozilla.org"
-                   chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:passwordmgr"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:passwordmgr"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:global-platform"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:global-platform"
-        chrome:displayName="Platform Specific"
-        chrome:author="mozilla.org"
-        chrome:name="global-platform"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:global-region"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:global-region"
-	chrome:displayName="US Regional Contents"
-        chrome:author="mozilla.org"
-        chrome:name="global-region"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:global"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:global"
-        chrome:displayName="Toolkit"
-        chrome:author="mozilla.org"
-        chrome:name="global"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-                   chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:global-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:global-platform"
-	           chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:US:global-region"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_REGION_VERSION@"/>
 </RDF:RDF>
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 @@
   <!-- Version Information.  State that we work only with major version of this
        package. -->
   <RDF:Description about="urn:mozilla:locale:en-US:global"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
+	chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
 </RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:mozapps"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:mozapps"
-        chrome:displayName="Mozilla Application Support"
-        chrome:author="mozilla.org"
-        chrome:name="mozapps"
-        chrome:skinVersion="1.5"
-        chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:mozapps"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- version information -->
-  <RDF:Description about="urn:mozilla:locale:en-US:mozapps"
-     chrome:localeVersion="@MOZILLA_VERSION@"/>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:navigator-region"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:navigator-region"
-        chrome:author="mozilla.org"
-        chrome:name="navigator-region"
-	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:navigator"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:navigator"
-        chrome:displayName="Navigator"
-        chrome:author="mozilla.org"
-        chrome:name="navigator"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-</RDF:RDF>
-
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:navigator-platform"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:navigator-platform"
-        chrome:displayName="Mac Specific Resources"
-        chrome:author="mozilla.org"
-        chrome:name="navigator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:navigator-platform"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:navigator-platform"
-        chrome:displayName="UNIX Bindings"
-        chrome:author="mozilla.org"
-        chrome:name="navigator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:navigator-platform"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:navigator-platform"
-        chrome:displayName="Windows Specific Resources"
-        chrome:author="mozilla.org"
-        chrome:name="navigator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:US"
-        chrome:author="mozilla.org"
-        chrome:name="US"
-        chrome:previewURL="http://www.mozilla.org/locales/US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:US:packages">
-        <RDF:li resource="urn:mozilla:locale:US:navigator-region"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:US:navigator-region"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:navigator"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:navigator"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:author="mozilla.org"
-        chrome:name="en-US"
-        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:navigator-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:navigator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:author="mozilla.org"
-        chrome:name="en-US"
-        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:navigator-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:navigator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:author="mozilla.org"
-        chrome:name="en-US"
-        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:navigator-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:navigator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:communicator-platform"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:communicator-platform"
-        chrome:displayName="Platform Specific Bindings"
-        chrome:author="mozilla.org"
-        chrome:name="communicator-platform"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:communicator-region"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:communicator-region"
-        chrome:author="mozilla.org"
-        chrome:name="communicator-region"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:communicator"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:communicator"
-        chrome:displayName="Communicator Shared"
-        chrome:author="mozilla.org"
-        chrome:name="communicator"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-
-</RDF:RDF>
-
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:US"
-        chrome:author="mozilla.org"
-        chrome:name="US"
-        chrome:previewURL="http://www.mozilla.org/locales/US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:US:packages">
-        <RDF:li resource="urn:mozilla:locale:US:communicator-region"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:US:communicator-region"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:communicator"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:communicator"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:communicator-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-             chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:communicator-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:communicator-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<!-- ----- BEGIN LICENSE BLOCK -----
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code
-   -
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp. Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.
-   - All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either of the GNU General Public License Version 2 or later (the "GPL"),
-   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ----- END LICENSE BLOCK ----- -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locales being supplied -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:mozldap"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:mozldap"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:download-manager"/>
-  </RDF:Seq>
- 
-  <RDF:Description about="urn:mozilla:package:download-manager"
-                   chrome:displayName="Mac-specific dl mgr files"
-                   chrome:author="mozilla.org"
-                   chrome:name="dlmgr"
-                   chrome:localeVersion="@MOZILLA_VERSION@"
-                   chrome:skinVersion="1.5">
-  </RDF:Description>
- 
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/downloadmanager/downloadmanager.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/downloadmanager/downloadmanager.xul">
-    <RDF:li>chrome://communicator/content/downloadmanager/dlmanagermenuoverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:download-manager"/>
-  </RDF:Seq>
- 
-  <RDF:Description about="urn:mozilla:package:download-manager"
-                   chrome:displayName="Unix-specific dl mgr files"
-                   chrome:author="mozilla.org"
-                   chrome:name="dlmgr"
-                   chrome:localeVersion="@MOZILLA_VERSION@"
-                   chrome:skinVersion="1.5">
-  </RDF:Description>
- 
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/downloadmanager/downloadmanager.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/downloadmanager/downloadmanager.xul">
-    <RDF:li>chrome://communicator/content/tasksOverlay.xul</RDF:li>
-    <RDF:li>chrome://communicator/content/utilityOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:download-manager"/>
-  </RDF:Seq>
- 
-  <RDF:Description about="urn:mozilla:package:download-manager"
-                   chrome:displayName="Win-specific dl mgr files"
-                   chrome:author="mozilla.org"
-                   chrome:name="dlmgr"
-                   chrome:localeVersion="@MOZILLA_VERSION@"
-                   chrome:skinVersion="1.5">
-  </RDF:Description>
- 
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/downloadmanager/downloadmanager.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq about="chrome://communicator/content/downloadmanager/downloadmanager.xul">
-    <RDF:li>chrome://communicator/content/tasksOverlay.xul</RDF:li>
-    <RDF:li>chrome://communicator/content/utilityOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:author="mozilla.org"
-        chrome:name="en-US"
-        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:communicator-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:author="mozilla.org"
-        chrome:name="en-US"
-        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:communicator-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:author="mozilla.org"
-        chrome:name="en-US"
-        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:communicator-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:global-platform"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:global-platform"
-        chrome:displayName="Platform Specific"
-        chrome:author="mozilla.org"
-        chrome:name="global-platform"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:global-region"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:global-region"
-	chrome:displayName="US Regional Contents"
-        chrome:author="mozilla.org"
-        chrome:name="global-region"
- 	chrome:localeVersion="@MOZILLA_VERSION@">
-  </RDF:Description>
-
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:global"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:global"
-        chrome:displayName="Toolkit"
-        chrome:author="mozilla.org"
-        chrome:name="global"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-</RDF:RDF>
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 @@
-<!ENTITY  lang.version          "@MOZILLA_VERSION@">
-<!ENTITY  brandShortName        "Mozilla">
-<!ENTITY  vendorShortName       "Mozilla">
-<!ENTITY  sidebarName           "Sidebar">
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:US"
-        chrome:displayName="US Region"
-        chrome:author="mozilla.org"
-        chrome:name="US"
-        chrome:localeType="region"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:previewURL="http://www.mozilla.org/locales/US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:US:packages">
-        <RDF:li resource="urn:mozilla:locale:US:global-region"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:US:global-region"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:displayName="English(US)"
-        chrome:author="mozilla.org"
-        chrome:name="en-US"
-        chrome:localeVersion="@MOZILLA_VERSION@"
-        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:global"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:global"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:global-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:global-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:global-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:global-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<!-- brand.dtd -->
-<!ENTITY  vendorURL             "http://www.mozilla.org/">
-<!ENTITY  releaseURL            "http://www.mozilla.org/releases/mozilla@MOZILLA_VERSION@">
-<!ENTITY  getNewThemesURL       "http://mozilla.org/themes/download/">
-<!ENTITY  content.version       "@MOZILLA_VERSION@">
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-             chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:global-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:global-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>
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 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US"
-        chrome:name="en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:global-platform"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:global-platform"
-	chrome:localeVersion="@MOZILLA_VERSION@"/>
-</RDF:RDF>