1. 61626:"Need to make langxxxx.xpi platform neutral"

2. 70622: fix the "update.html" is also included. 3. 69934: make regus.jst & langenus.jst more localization friendly. r=ssu,sr=deveditz.
2001-03-06 02:34:34 +00:00 · 2001-03-06 02:34:34 +00:00 · bf75e393f7
--- a/profile/src/nsProfile.cpp
+++ b/profile/src/nsProfile.cpp
@ -1707,7 +1707,7 @@ nsProfile::DefineLocaleDefaultsDir()
        if (NS_SUCCEEDED(rv))
        {
            nsXPIDLString localeName;
-            rv = chromeRegistry->GetSelectedLocale(NS_LITERAL_STRING("navigator"), getter_Copies(localeName));
+            rv = chromeRegistry->GetSelectedLocale(NS_LITERAL_STRING("global-region"), getter_Copies(localeName));
            if (NS_SUCCEEDED(rv))
                rv = localeDefaults->AppendUnicode(localeName);
        }
--- a/xpfe/browser/Makefile.in
+++ b/xpfe/browser/Makefile.in
@ -33,5 +33,7 @@ include $(topsrcdir)/config/rules.mk
 chrome::
 	@$(REGCHROME) content navigator comm.jar
 	@$(REGCHROME) content navigator-region comm.jar
+	@$(REGCHROME) content navigator-platform comm.jar
 	@$(REGCHROME) locale en-US/navigator en-US.jar
 	@$(REGCHROME) locale US/navigator-region US.jar
+	@$(REGCHROME) locale en-US/navigator-platform en-unix.jar
--- a/xpfe/browser/resources/content/unix/contents-platform.rdf
+++ b/xpfe/browser/resources/content/unix/contents-platform.rdf
@ -0,0 +1,16 @@
+<?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">
+  </RDF:Description>
+</RDF:RDF>
--- a/xpfe/browser/resources/content/unix/jar.mn
+++ b/xpfe/browser/resources/content/unix/jar.mn
@ -1,2 +1,3 @@
 comm.jar:
+    content/navigator-platform/contents.rdf        (contents-platform.rdf)
    content/navigator/platformNavigationBindings.xul
--- a/xpfe/browser/resources/content/unix/platformNavigationBindings.xul
+++ b/xpfe/browser/resources/content/unix/platformNavigationBindings.xul
@ -1,6 +1,6 @@
 <?xml version="1.0"?>

-<!DOCTYPE window SYSTEM "chrome://navigator/locale/platformNavigationBindings.dtd">
+<!DOCTYPE window SYSTEM "chrome://navigator-platform/locale/platformNavigationBindings.dtd">

 <overlay id="platformNavigationBindings"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf
+++ b/xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf
@ -0,0 +1,22 @@
+<?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:displayName="English UNIX"
+        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>
+</RDF:RDF>
--- a/xpfe/browser/resources/locale/en-US/unix/jar.mn
+++ b/xpfe/browser/resources/locale/en-US/unix/jar.mn
@ -1,2 +1,3 @@
-en-US.jar:
-        locale/en-US/navigator/platformNavigationBindings.dtd
+en-unix.jar:
+        locale/en-US/navigator-platform/contents.rdf 			(contents-platform.rdf)
+        locale/en-US/navigator-platform/platformNavigationBindings.dtd
--- a/xpfe/communicator/Makefile.in
+++ b/xpfe/communicator/Makefile.in
@ -33,5 +33,7 @@ include $(topsrcdir)/config/rules.mk
 chrome::
 	@$(REGCHROME) content communicator comm.jar
 	@$(REGCHROME) content communicator-region comm.jar
+	@$(REGCHROME) content communicator-platform comm.jar
 	@$(REGCHROME) locale en-US/communicator en-US.jar
 	@$(REGCHROME) locale US/communicator-region US.jar
+	@$(REGCHROME) locale en-US/communicator-platform en-unix.jar
--- a/xpfe/communicator/jar.mn
+++ b/xpfe/communicator/jar.mn
@ -1,4 +1,5 @@
 comm.jar:
+    content/communicator-platform/contents.rdf           (resources/content/contents-platform.rdf)
    content/communicator-region/contents.rdf             (resources/content/contents-region.rdf)
    content/communicator/contents.rdf                    (resources/content/contents.rdf)
    content/communicator/communicatorOverlay.xul         (resources/content/communicatorOverlay.xul) 
--- a/xpfe/communicator/makefile.win
+++ b/xpfe/communicator/makefile.win
@ -28,5 +28,7 @@ include <$(DEPTH)\config\rules.mak>
 chrome::
        $(REGCHROME) content communicator comm.jar
        $(REGCHROME) content communicator-region comm.jar
+        $(REGCHROME) content communicator-platform comm.jar
        $(REGCHROME) locale en-US/communicator en-US.jar
        $(REGCHROME) locale US/communicator-region US.jar
+        $(REGCHROME) locale en-US/communicator-platform en-win.jar
--- a/xpfe/communicator/resources/content/contents-platform.rdf
+++ b/xpfe/communicator/resources/content/contents-platform.rdf
@ -0,0 +1,16 @@
+<?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">
+  </RDF:Description>
+</RDF:RDF>
--- a/xpfe/communicator/resources/content/mac/platformGlobalOverlay.xul
+++ b/xpfe/communicator/resources/content/mac/platformGlobalOverlay.xul
@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- mac version of platformGlobalOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global/locale/platformGlobalOverlay.dtd">
+<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformGlobalOverlay.dtd">


 <overlay id="platformGlobalOverlay"
--- a/xpfe/communicator/resources/content/os2/platformGlobalOverlay.xul
+++ b/xpfe/communicator/resources/content/os2/platformGlobalOverlay.xul
@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- os2 version of platformGlobalOverlay.xul -->

-<!DOCTYPE os2 SYSTEM "chrome://global/locale/platformGlobalOverlay.dtd">
+<!DOCTYPE os2 SYSTEM "chrome://global-platform/locale/platformGlobalOverlay.dtd">


 <overlay id="platformGlobalOverlay"
--- a/xpfe/communicator/resources/content/unix/platformGlobalOverlay.xul
+++ b/xpfe/communicator/resources/content/unix/platformGlobalOverlay.xul
@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- unix version of platformGlobalOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global/locale/platformGlobalOverlay.dtd">
+<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformGlobalOverlay.dtd">

 <overlay id="platformGlobalOverlay"
 		 xmlns:html="http://www.w3.org/1999/xhtml"
--- a/xpfe/communicator/resources/content/win/platformGlobalOverlay.xul
+++ b/xpfe/communicator/resources/content/win/platformGlobalOverlay.xul
@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- win version of platformGlobalOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global/locale/platformGlobalOverlay.dtd">
+<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformGlobalOverlay.dtd">


 <overlay id="platformGlobalOverlay"
--- a/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
@ -28,7 +28,7 @@
  

 <!DOCTYPE window [
-<!ENTITY % platformDTD SYSTEM "chrome://global/locale/platformDialogOverlay.dtd" >
+<!ENTITY % platformDTD SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd" >
 %platformDTD;
 <!ENTITY % prefMousewheelDTD SYSTEM "chrome://communicator/locale/pref/pref-mousewheel.dtd" >
 %prefMousewheelDTD;
--- a/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
@ -29,7 +29,7 @@
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
-<!ENTITY % platformDTD SYSTEM "chrome://global/locale/platformDialogOverlay.dtd" >
+<!ENTITY % platformDTD SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd" >
 %platformDTD;
 <!ENTITY % prefWinhooksDTD SYSTEM "chrome://communicator/locale/pref/pref-winhooks.dtd" >
 %prefWinhooksDTD;
--- a/xpfe/components/prefwindow/resources/content/unix/platformPrefOverlay.xul
+++ b/xpfe/components/prefwindow/resources/content/unix/platformPrefOverlay.xul
@ -23,7 +23,7 @@
     Ben Goodger <ben@netscape.com>
  -->

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/platformPrefOverlay.dtd">  
+<!DOCTYPE window SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd">  
  
 <overlay id="platformPreferencesOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/xpfe/components/prefwindow/resources/content/win/platformPrefOverlay.xul
+++ b/xpfe/components/prefwindow/resources/content/win/platformPrefOverlay.xul
@ -23,7 +23,7 @@
     Ben Goodger <ben@netscape.com>
  -->

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/platformPrefOverlay.dtd">  
+<!DOCTYPE window SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd">  
  
 <overlay id="platformPreferencesOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf
+++ b/xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf
@ -0,0 +1,21 @@
+<?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>
+</RDF:RDF>
--- a/xpfe/components/prefwindow/resources/locale/en-US/unix/jar.mn
+++ b/xpfe/components/prefwindow/resources/locale/en-US/unix/jar.mn
@ -1,2 +1,3 @@
-en-US.jar:
-        locale/en-US/communicator/pref/platformPrefOverlay.dtd
+en-unix.jar:
+        locale/en-US/communicator-platform/contents.rdf 			(contents-platform.rdf)
+        locale/en-US/communicator-platform/pref/platformPrefOverlay.dtd
--- a/xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf
+++ b/xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf
@ -0,0 +1,21 @@
+<?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>
+</RDF:RDF>
--- a/xpfe/components/prefwindow/resources/locale/en-US/win/jar.mn
+++ b/xpfe/components/prefwindow/resources/locale/en-US/win/jar.mn
@ -1,2 +1,3 @@
-en-US.jar:
-        locale/en-US/communicator/pref/platformPrefOverlay.dtd
+en-win.jar:
+        locale/en-US/communicator-platform/contents.rdf			(contents-platform.rdf)
+        locale/en-US/communicator-platform/pref/platformPrefOverlay.dtd
--- a/xpfe/global/Makefile.in
+++ b/xpfe/global/Makefile.in
@ -41,6 +41,8 @@ build.dtd: build.dtd.in $(DEPTH)/config/build_number
 chrome::
 	@$(REGCHROME) content global toolkit.jar
 	@$(REGCHROME) content global-region toolkit.jar
+	@$(REGCHROME) content global-platform toolkit.jar
 	@$(REGCHROME) locale en-US/global en-US.jar
 	@$(REGCHROME) locale US/global-region US.jar
+	@$(REGCHROME) locale en-US/global-platform en-unix.jar

--- a/xpfe/global/jar.mn
+++ b/xpfe/global/jar.mn
@ -1,5 +1,6 @@
 toolkit.jar:
 	content/global/contents.rdf                 (resources/content/contents.rdf)
+        content/global-platform/contents.rdf        (resources/content/contents-platform.rdf)
 	content/global-region/contents.rdf          (resources/content/contents-region.rdf)
 	content/global/hiddenWindow.xul             (resources/content/hiddenWindow.xul) 
 	content/global/globalOverlay.xul            (resources/content/globalOverlay.xul) 
--- a/xpfe/global/makefile.win
+++ b/xpfe/global/makefile.win
@ -30,9 +30,11 @@ include <$(DEPTH)\config\rules.mak>

 chrome::
        $(REGCHROME) content global toolkit.jar
-        $(REGCHROME) content global-region toolkit.jar
+	$(REGCHROME) content global-region toolkit.jar
+	$(REGCHROME) content global-platform toolkit.jar
        $(REGCHROME) locale en-US/global en-US.jar
        $(REGCHROME) locale US/global-region US.jar
+	$(REGCHROME) locale en-US/global-platform en-win.jar

 build.dtd: build.dtd.in $(DEPTH)\config\build_number
 	@rm -f $@
--- a/xpfe/global/resources/content/contents-platform.rdf
+++ b/xpfe/global/resources/content/contents-platform.rdf
@ -0,0 +1,16 @@
+<?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">
+  </RDF:Description>
+</RDF:RDF>
--- a/xpfe/global/resources/content/mac/platformGlobalOverlay.xul
+++ b/xpfe/global/resources/content/mac/platformGlobalOverlay.xul
@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- mac version of platformGlobalOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global/locale/platformGlobalOverlay.dtd">
+<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformGlobalOverlay.dtd">


 <overlay id="platformGlobalOverlay"
--- a/xpfe/global/resources/content/os2/platformDialogOverlay.xul
+++ b/xpfe/global/resources/content/os2/platformDialogOverlay.xul
@ -21,7 +21,7 @@
   -->
 <!-- os2 version of platformDialogOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global/locale/platformDialogOverlay.dtd">
+<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">

 <overlay id="platformDialogOverlay"
             xmlns:html="http://www.w3.org/1999/xhtml"
--- a/xpfe/global/resources/content/os2/platformGlobalOverlay.xul
+++ b/xpfe/global/resources/content/os2/platformGlobalOverlay.xul
@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- os2 version of platformGlobalOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global/locale/platformGlobalOverlay.dtd">
+<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformGlobalOverlay.dtd">


 <overlay id="platformGlobalOverlay"
--- a/xpfe/global/resources/content/unix/platformDialogOverlay.xul
+++ b/xpfe/global/resources/content/unix/platformDialogOverlay.xul
@ -21,7 +21,7 @@
   -->
 <!-- unix version of platformDialogOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global/locale/platformDialogOverlay.dtd">
+<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">

 <overlay id="platformDialogOverlay"
             xmlns:html="http://www.w3.org/1999/xhtml"
--- a/xpfe/global/resources/content/unix/platformGlobalOverlay.xul
+++ b/xpfe/global/resources/content/unix/platformGlobalOverlay.xul
@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- unix version of platformGlobalOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global/locale/platformGlobalOverlay.dtd">
+<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformGlobalOverlay.dtd">

 <overlay id="platformGlobalOverlay"
 		 xmlns:html="http://www.w3.org/1999/xhtml"
--- a/xpfe/global/resources/content/unix/printdialog.xul
+++ b/xpfe/global/resources/content/unix/printdialog.xul
@ -25,7 +25,7 @@ Contributor(s): Masaki Katakai <katakai@japan.sun.com>

 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-<!DOCTYPE window SYSTEM "chrome://global/locale/printdialog.dtd">
+<!DOCTYPE window SYSTEM "chrome://global-platform/locale/printdialog.dtd">

 <window xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
--- a/xpfe/global/resources/content/win/platformDialogOverlay.xul
+++ b/xpfe/global/resources/content/win/platformDialogOverlay.xul
@ -22,7 +22,7 @@

 <!-- win version of platformDialogOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global/locale/platformDialogOverlay.dtd">
+<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">

 <overlay id="platformDialogOverlay"
             xmlns:html="http://www.w3.org/1999/xhtml"
--- a/xpfe/global/resources/content/win/platformGlobalOverlay.xul
+++ b/xpfe/global/resources/content/win/platformGlobalOverlay.xul
@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- win version of platformGlobalOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global/locale/platformGlobalOverlay.dtd">
+<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformGlobalOverlay.dtd">


 <overlay id="platformGlobalOverlay"
--- a/xpfe/global/resources/locale/en-US/mac/contents-platform.rdf
+++ b/xpfe/global/resources/locale/en-US/mac/contents-platform.rdf
@ -0,0 +1,19 @@
+<?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>
+</RDF:RDF>
--- a/xpfe/global/resources/locale/en-US/mac/jar.mn
+++ b/xpfe/global/resources/locale/en-US/mac/jar.mn
@ -1,3 +1,4 @@
-en-US.jar:
-    locale/en-US/global/platformGlobalOverlay.dtd
-    locale/en-US/global/platformDialogOverlay.dtd
+en-mac.jar:
+    locale/en-US/global-platform/contents.rdf		(contents-platform.rdf)
+    locale/en-US/global-platform/platformGlobalOverlay.dtd
+    locale/en-US/global-platform/platformDialogOverlay.dtd
--- a/xpfe/global/resources/locale/en-US/os2/contents-platform.rdf
+++ b/xpfe/global/resources/locale/en-US/os2/contents-platform.rdf
@ -0,0 +1,19 @@
+<?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>
+</RDF:RDF>
--- a/xpfe/global/resources/locale/en-US/os2/jar.mn
+++ b/xpfe/global/resources/locale/en-US/os2/jar.mn
@ -1,3 +1,4 @@
-en-US.jar:
-    locale/en-US/global/platformGlobalOverlay.dtd
-    locale/en-US/global/platformDialogOverlay.dtd
+en-os2.jar:
+    locale/en-US/global-platform/contents.rdf		(contents-platform.rdf)
+    locale/en-US/global-platform/platformGlobalOverlay.dtd
+    locale/en-US/global-platform/platformDialogOverlay.dtd
--- a/xpfe/global/resources/locale/en-US/unix/contents-platform.rdf
+++ b/xpfe/global/resources/locale/en-US/unix/contents-platform.rdf
@ -0,0 +1,19 @@
+<?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>
+</RDF:RDF>
--- a/xpfe/global/resources/locale/en-US/unix/jar.mn
+++ b/xpfe/global/resources/locale/en-US/unix/jar.mn
@ -1,4 +1,5 @@
-en-US.jar:
-    locale/en-US/global/platformGlobalOverlay.dtd
-    locale/en-US/global/platformDialogOverlay.dtd
-    locale/en-US/global/printdialog.dtd
+en-unix.jar:
+    locale/en-US/global-platform/contents.rdf 		(contents-platform.rdf)
+    locale/en-US/global-platform/platformGlobalOverlay.dtd
+    locale/en-US/global-platform/platformDialogOverlay.dtd
+    locale/en-US/global-platform/printdialog.dtd
--- a/xpfe/global/resources/locale/en-US/win/contents-platform.rdf
+++ b/xpfe/global/resources/locale/en-US/win/contents-platform.rdf
@ -0,0 +1,19 @@
+<?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>
+</RDF:RDF>
--- a/xpfe/global/resources/locale/en-US/win/jar.mn
+++ b/xpfe/global/resources/locale/en-US/win/jar.mn
@ -1,3 +1,4 @@
-en-US.jar:
-    locale/en-US/global/platformGlobalOverlay.dtd
-    locale/en-US/global/platformDialogOverlay.dtd
+en-win.jar:
+    locale/en-US/global-platform/contents.rdf 		(contents-platform.rdf)
+    locale/en-US/global-platform/platformGlobalOverlay.dtd
+    locale/en-US/global-platform/platformDialogOverlay.dtd
--- a/xpinstall/packager/mac/browser.jst
+++ b/xpinstall/packager/mac/browser.jst
@ -18,6 +18,9 @@ if (verifyDiskSpace(fProgram, srDest))
    logComment("addDirectory() returned: " + err);

    var cf = getFolder("Chrome");
+    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global-platform/");
+    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator-platform/");
+
    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global-region/");
    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator-region/");
    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/editor-region/");
--- a/xpinstall/packager/mac/langenus.jst
+++ b/xpinstall/packager/mac/langenus.jst
@ -4,10 +4,14 @@ var err;
 var fProgram;

 // --- LOCALIZATION NOTE: translate only these ---
-var prettyName = "English-US Language Pack";
-var regName    = "locales/mozilla/en-US";
-var chromeName = "en-US.jar";
+var prettyName = "English (US) Language Pack";
+var langcode = "en";
+var chromeNode = langcode + "-US";
 // --- END LOCALIZABLE RESOURCES ---
+var regName      = "locales/mozilla/" + chromeNode;
+var chromeName   = chromeNode + ".jar";
+var platformName = langcode + "-mac.jar";
+var localeName   = "locale/" + chromeNode + "/";

 err = initInstall(prettyName, regName, "$Version$"); 
 logComment("initInstall: " + err);
@ -26,14 +30,17 @@ if (verifyDiskSpace(fProgram, srDest))
    logComment("addDirectory() returned: " + err);

    var cf = getFolder("Chrome");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/global/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/communicator/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/messenger/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/editor/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/navigator/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/necko/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/cookie/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/wallet/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "global/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "communicator/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "messenger/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "editor/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "navigator/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "necko/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "cookie/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "wallet/");
+
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "global-platform/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "communicator-platform/");

    if(err == SUCCESS)
    {
--- a/xpinstall/packager/mac/regus.jst
+++ b/xpinstall/packager/mac/regus.jst
@ -5,9 +5,11 @@ var fProgram;

 // --- LOCALIZATION NOTE: translate only these ---
 var prettyName = "US Region Pack";
-var regName    = "locales/mozilla/US";
-var chromeName = "US.jar";
+var chromeNode = "US";
 // --- END LOCALIZABLE RESOURCES ---
+var regName    = "locales/mozilla/" + chromeNode;
+var chromeName = chromeNode + ".jar";
+var localeName = "locale/" + chromeNode + "/";

 err = initInstall(prettyName, regName, "$Version$"); 
 logComment("initInstall: " + err);
@ -26,11 +28,11 @@ if (verifyDiskSpace(fProgram, srDest))
    logComment("addDirectory() returned: " + err);

    var cf = getFolder("Chrome");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/global-region/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/communicator-region/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/editor-region/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/messenger-region/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/navigator-region/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "global-region/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "communicator-region/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "editor-region/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "messenger-region/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "navigator-region/");

    if(err == SUCCESS)
    {
--- a/xpinstall/packager/packages-mac
+++ b/xpinstall/packager/packages-mac
@ -12,6 +12,7 @@
 ;
 ; en-US 
 viewer:chrome:en-US.jar
+viewer:chrome:en-mac.jar

 [regus]
 ;
--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@ -12,6 +12,7 @@
 ;
 ; en-US
 bin/chrome/en-US.jar
+bin/chrome/en-unix.jar

 [regus]
 ;
--- a/xpinstall/packager/packages-win
+++ b/xpinstall/packager/packages-win
@ -12,6 +12,7 @@
 ;
 ; en-US 
 bin\chrome\en-US\*
+bin\chrome\en-win\*

 [regus]
 ;
--- a/xpinstall/packager/unix/browser.jst
+++ b/xpinstall/packager/unix/browser.jst
@ -23,6 +23,10 @@ if (verifyDiskSpace(communicatorFolder, srDest))
    logComment("dirCreate() returned: " + ignoreErr);

    var cf = getFolder("Chrome");
+    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global-platform/");
+    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator-platform/");
+    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/navigator-platform/");
+
    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global-region/");
    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator-region/");
    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/editor-region/");
--- a/xpinstall/packager/unix/config.it
+++ b/xpinstall/packager/unix/config.it
@ -160,9 +160,9 @@ Attributes=SELECTED|INVISIBLE
 URL0=$URLPath$

 [Component7]
-Description Short=English US Language Pack
+Description Short=English (US) Language Pack
 ; *** LOCALIZE ME BABY ***
-Description Long=English US Language Pack
+Description Long=English (US) Language Pack
 Archive=langenus.xpi
 $InstallSize$:langenus
 Attributes=SELECTED|INVISIBLE
--- a/xpinstall/packager/unix/langenus.jst
+++ b/xpinstall/packager/unix/langenus.jst
@ -3,10 +3,14 @@ var err;
 var fProgram;

 // --- LOCALIZATION NOTE: translate only these ---
-var prettyName = "English-US Language Pack";
-var regName    = "locales/mozilla/en-US";
-var chromeName = "en-US.jar";
+var prettyName = "English (US) Language Pack";
+var langcode = "en";
+var chromeNode = langcode + "-US";
 // --- END LOCALIZABLE RESOURCES ---
+var regName    = "locales/mozilla/" + chromeNode;
+var chromeName = chromeNode + ".jar";
+var platformName = langcode + "-unix.jar";
+var localeName = "locale/" + chromeNode + "/";

 err = initInstall(prettyName, regName, "$Version$"); 
 logComment("initInstall: " + err);
@ -26,14 +30,17 @@ if (verifyDiskSpace(fProgram, srDest))

    // register chrome
    var cf = getFolder("Chrome");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/global/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/communicator/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/messenger/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/editor/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/navigator/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/necko/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/cookie/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/wallet/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "global/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "communicator/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "messenger/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "editor/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "navigator/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "necko/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "cookie/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "wallet/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "global-platform/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "communicator-platform/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "navigator-platform/");

    if (err == SUCCESS)
    {
--- a/xpinstall/packager/unix/regus.jst
+++ b/xpinstall/packager/unix/regus.jst
@ -4,9 +4,11 @@ var fProgram;

 // --- LOCALIZATION NOTE: translate only these ---
 var prettyName = "US Regional Pack";
-var regName    = "locales/mozilla/US";
-var chromeName = "US.jar";
+var chromeNode = "US";
 // --- END LOCALIZABLE RESOURCES ---
+var regName    = "locales/mozilla/" + chromeNode;
+var chromeName = chromeNode + ".jar";
+var localeName = "locale/" + chromeNode + "/";

 err = initInstall(prettyName, regName, "$Version$"); 
 logComment("initInstall: " + err);
@ -26,11 +28,11 @@ if (verifyDiskSpace(fProgram, srDest))

    // register chrome
    var cf = getFolder("Chrome");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/global-region/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/communicator-region/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/editor-region/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/messenger-region/");
-    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/navigator-region/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "global-region/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "communicator-region/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "editor-region/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "messenger-region/");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "navigator-region/");

    if (err == SUCCESS)
    {
--- a/xpinstall/packager/windows/browser.jst
+++ b/xpinstall/packager/windows/browser.jst
@ -238,6 +238,9 @@ if(verifyDiskSpace(fProgram, srDest))
    resetError();

    // register chrome
+    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global-platform/");
+    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator-platform/");
+
    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global/");
    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global-region/");
    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/cookie/");
--- a/xpinstall/packager/windows/config.it
+++ b/xpinstall/packager/windows/config.it
@ -435,9 +435,9 @@ Force Upgrade File0=[SETUP PATH]\defaults\profile\bookmarks.html

 [Component En US lang pack]
 ;*** LOCALIZE ME BABY ***
-Description Short=English-US language pack
+Description Short=English (US) language pack
 ;*** LOCALIZE ME BABY ***
-Description Long=English-US language pack
+Description Long=English (US)language pack
 Archive=langenus.xpi
 $InstallSize$:langenus
 $InstallSizeSystem$
--- a/xpinstall/packager/windows/langenus.jst
+++ b/xpinstall/packager/windows/langenus.jst
@ -4,10 +4,14 @@ var err;
 var fProgram;

 // ----LOCALIZATION NOTE: translate only these ------
-var prettyName = "English-US Language Pack";
-var regName    = "locales/mozilla/en-US";
-var chromeName = "en-US.jar";
+var prettyName = "English (US) Language Pack";
+var langcode = "en";
+var chromeNode = langcode + "-US";
 // --- END CHANGABLE STUFF ---
+var regName    = "locales/mozilla/" + chromeNode;
+var chromeName = chromeNode + ".jar";
+var platformName = langcode + "-win.jar";
+var localeName = "locale/" + chromeNode + "/";

 srDest = $SpaceRequired$:bin;
 err    = initInstall(prettyName, regName, "$Version$"); 
@ -29,15 +33,18 @@ if(verifyDiskSpace(fProgram, srDest))

  // register chrome
  var cf = getFolder("Chrome");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/global/");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/communicator/");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/messenger/");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/editor/");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/navigator/");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/necko/");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/cookie/");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/wallet/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "global/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "communicator/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "messenger/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "editor/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "navigator/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "necko/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "cookie/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "wallet/");

+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "global-platform/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "communicator-platform/");
+ 
  // check return value
  if(err == SUCCESS)
  {
--- a/xpinstall/packager/windows/regus.jst
+++ b/xpinstall/packager/windows/regus.jst
@ -5,10 +5,13 @@ var fProgram;

 // ----LOCALIZATION NOTE: translate only these ------
 var prettyName = "US Region Pack";
-var regName    = "locales/mozilla/US";
-var chromeName = "US.jar";
+var chromeNode = "US";
 // --- END CHANGABLE STUFF ---

+var regName    = "locales/mozilla/" + chromeNode;
+var chromeName = chromeNode + ".jar";
+var localeName = "locale/" + chromeNode + "/";
+
 srDest = $SpaceRequired$:bin;
 err    = initInstall(prettyName, regName, "$Version$"); 
 logComment("initInstall: " + err);
@ -29,11 +32,11 @@ if(verifyDiskSpace(fProgram, srDest))

  // register chrome
  var cf = getFolder("Chrome");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/global-region/");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/communicator-region/");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/editor-region/");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/messenger-region/");
-  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/navigator-region/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "global-region/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "communicator-region/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "editor-region/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "messenger-region/");
+  registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "navigator-region/");

  // check return value
  if(err == SUCCESS)
--- a/xpinstall/wizard/mac/macbuild/Installer
+++ b/xpinstall/wizard/mac/macbuild/Installer
@ -88,9 +88,9 @@ Install Size=<#deflenus_size>
 Attributes=SELECTED|INVISIBLE

 [Component5]
-Description Short=English US Language Pack
+Description Short=English (US) Language Pack
 ; *** LOCALIZE ME BABY ***
-Description Long=English US Language Pack
+Description Long=English (US) Language Pack
 Archive=langenus.xpi
 Install Size=<#langenus_size>
 Attributes=SELECTED|INVISIBLE
--- a/xpinstall/wizard/mac/macbuild/config.ini_tmpl
+++ b/xpinstall/wizard/mac/macbuild/config.ini_tmpl
@ -88,9 +88,9 @@ Install Size=<#deflenus_size>
 Attributes=SELECTED|INVISIBLE

 [Component5]
-Description Short=English US Language Pack
+Description Short=English (US) Language Pack
 ; *** LOCALIZE ME BABY ***
-Description Long=English US Language Pack
+Description Long=English (US) Language Pack
 Archive=langenus.xpi
 Install Size=<#langenus_size>
 Attributes=SELECTED|INVISIBLE