diff --git a/mozilla/accessible/src/base/jar.mn b/mozilla/accessible/src/base/jar.mn
deleted file mode 100644
index 98a9b3b3981..00000000000
--- a/mozilla/accessible/src/base/jar.mn
+++ /dev/null
@@ -1,11 +0,0 @@
-en-win.jar:
-	locale/en-US/global-platform/accessible.properties
-
-en-unix.jar:
-	locale/en-US/global-platform/accessible.properties
-
-en-mac.jar:
-	locale/en-US/global-platform/accessible.properties
-
-
-
diff --git a/mozilla/caps/src/Makefile.in b/mozilla/caps/src/Makefile.in
index cab62453265..5ffe73e80dd 100644
--- a/mozilla/caps/src/Makefile.in
+++ b/mozilla/caps/src/Makefile.in
@@ -87,13 +87,6 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
-CHROME_DIR = locales/en-US
-CHROME_L10N_DIR = communicator/locale/security
-
-CHROME_L10N    = \
-		caps.properties \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../include
diff --git a/mozilla/caps/src/jar.mn b/mozilla/caps/src/jar.mn
deleted file mode 100644
index 4630a72c482..00000000000
--- a/mozilla/caps/src/jar.mn
+++ /dev/null
@@ -1,2 +0,0 @@
-en-US.jar:
-	locale/en-US/communicator/security/caps.properties
diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp
index f047bbb8a71..7f012bcbdce 100644
--- a/mozilla/caps/src/nsScriptSecurityManager.cpp
+++ b/mozilla/caps/src/nsScriptSecurityManager.cpp
@@ -2798,7 +2798,7 @@ nsresult nsScriptSecurityManager::Init()
     nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = bundleService->CreateBundle("chrome://communicator/locale/security/caps.properties", &sStrBundle);
+    rv = bundleService->CreateBundle("chrome://global/locale/security/caps.properties", &sStrBundle);
     NS_ENSURE_SUCCESS(rv, rv);
 
     //-- Register security check callback in the JS engine
diff --git a/mozilla/content/xml/document/resources/XMLPrettyPrint.xsl b/mozilla/content/xml/document/resources/XMLPrettyPrint.xsl
index 2f34ea97ce8..ad4125f9cf3 100644
--- a/mozilla/content/xml/document/resources/XMLPrettyPrint.xsl
+++ b/mozilla/content/xml/document/resources/XMLPrettyPrint.xsl
@@ -36,7 +36,7 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/xml/prettyprint.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://global/locale/xml/prettyprint.dtd">
 
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/mozilla/content/xml/document/resources/jar.mn b/mozilla/content/xml/document/resources/jar.mn
index 1bac16c8e00..d089a641308 100644
--- a/mozilla/content/xml/document/resources/jar.mn
+++ b/mozilla/content/xml/document/resources/jar.mn
@@ -3,6 +3,3 @@ comm.jar:
     content/communicator/xml/XMLMonoPrint.css                   (XMLMonoPrint.css)
     content/communicator/xml/XMLPrettyPrint.xml                 (XMLPrettyPrint.xml)
     content/communicator/xml/XMLPrettyPrint.xsl                 (XMLPrettyPrint.xsl)
-
-en-US.jar:
-    locale/en-US/communicator/xml/prettyprint.dtd               (locale/en-US/prettyprint.dtd)
diff --git a/mozilla/accessible/src/base/accessible.properties b/mozilla/dom/locales/en-US/chrome/accessibility/mac/accessible.properties
similarity index 100%
rename from mozilla/accessible/src/base/accessible.properties
rename to mozilla/dom/locales/en-US/chrome/accessibility/mac/accessible.properties
diff --git a/mozilla/dom/locales/en-US/chrome/accessibility/unix/accessible.properties b/mozilla/dom/locales/en-US/chrome/accessibility/unix/accessible.properties
new file mode 100644
index 00000000000..5563b016b21
--- /dev/null
+++ b/mozilla/dom/locales/en-US/chrome/accessibility/unix/accessible.properties
@@ -0,0 +1,12 @@
+jump    =       Jump
+press   =       Press
+check   =       Check
+uncheck =       Uncheck
+select  =       Select
+open    =       Open
+close   =       Close
+switch  =       Switch
+click   =       Click
+collapse=       Collapse
+expand  =       Expand
+activate=       Activate
diff --git a/mozilla/dom/locales/en-US/chrome/accessibility/win/accessible.properties b/mozilla/dom/locales/en-US/chrome/accessibility/win/accessible.properties
new file mode 100644
index 00000000000..5563b016b21
--- /dev/null
+++ b/mozilla/dom/locales/en-US/chrome/accessibility/win/accessible.properties
@@ -0,0 +1,12 @@
+jump    =       Jump
+press   =       Press
+check   =       Check
+uncheck =       Uncheck
+select  =       Select
+open    =       Open
+close   =       Close
+switch  =       Switch
+click   =       Click
+collapse=       Collapse
+expand  =       Expand
+activate=       Activate
diff --git a/mozilla/parser/htmlparser/src/xmlparser.properties b/mozilla/dom/locales/en-US/chrome/layout/xmlparser.properties
similarity index 100%
rename from mozilla/parser/htmlparser/src/xmlparser.properties
rename to mozilla/dom/locales/en-US/chrome/layout/xmlparser.properties
diff --git a/mozilla/caps/src/caps.properties b/mozilla/dom/locales/en-US/chrome/security/caps.properties
similarity index 100%
rename from mozilla/caps/src/caps.properties
rename to mozilla/dom/locales/en-US/chrome/security/caps.properties
diff --git a/mozilla/extensions/webservices/security/src/security.properties b/mozilla/dom/locales/en-US/chrome/webservices/security.properties
similarity index 100%
rename from mozilla/extensions/webservices/security/src/security.properties
rename to mozilla/dom/locales/en-US/chrome/webservices/security.properties
diff --git a/mozilla/content/xml/document/resources/locale/en-US/prettyprint.dtd b/mozilla/dom/locales/en-US/chrome/xml/prettyprint.dtd
similarity index 100%
rename from mozilla/content/xml/document/resources/locale/en-US/prettyprint.dtd
rename to mozilla/dom/locales/en-US/chrome/xml/prettyprint.dtd
diff --git a/mozilla/dom/locales/jar.mn b/mozilla/dom/locales/jar.mn
index d3834898436..9a15749e605 100644
--- a/mozilla/dom/locales/jar.mn
+++ b/mozilla/dom/locales/jar.mn
@@ -13,7 +13,25 @@
   locale/@AB_CD@/global/plugins.properties                     (%chrome/plugins.properties)
   locale/@AB_CD@/global/nsWebBrowserPersist.properties         (%chrome/nsWebBrowserPersist.properties)
   locale/@AB_CD@/global/printdialog.properties                 (%chrome/printdialog.properties)
-  locale/@AB_CD@/global/layout/HtmlForm.properties             (%chrome/layout/HtmlForm.properties)
   locale/@AB_CD@/global/xslt/xslt.properties                   (%chrome/xslt/xslt.properties)
   locale/@AB_CD@/global/dom/dom.properties                     (%chrome/dom/dom.properties)
   locale/@AB_CD@/global/layout/MediaDocument.properties        (%chrome/layout/MediaDocument.properties)
+  locale/@AB_CD@/global/layout/xmlparser.properties            (%chrome/layout/xmlparser.properties)
+  locale/@AB_CD@/global/layout/HtmlForm.properties             (%chrome/layout/HtmlForm.properties)
+  locale/@AB_CD@/global/security/caps.properties               (%chrome/security/caps.properties)
+  locale/@AB_CD@/global/xml/prettyprint.dtd                    (%chrome/xml/prettyprint.dtd)
+  locale/@AB_CD@/global/webservices/security.properties        (%chrome/webservices/security.properties)
+#ifdef MOZ_XUL_APP
+  locale/@AB_CD@/global-platform/win/accessible.properties     (%chrome/accessibility/win/accessible.properties)
+  locale/@AB_CD@/global-platform/mac/accessible.properties     (%chrome/accessibility/mac/accessible.properties)
+  locale/@AB_CD@/global-platform/unix/accessible.properties    (%chrome/accessibility/unix/accessible.properties)
+#endif
+
+#ifndef MOZ_XUL_APP
+en-win.jar:
+  locale/en-US/global-platform/accessible.properties         (%chrome/accessibility/win/accessible.properties)
+en-unix.jar:
+  locale/en-US/global-platform/accessible.properties         (%chrome/accessibility/unix/accessible.properties)
+en-mac.jar:
+  locale/en-US/global-platform/accessible.properties         (%chrome/accessibility/mac/accessible.properties)
+#endif
diff --git a/mozilla/embedding/config/embed-jar.mn b/mozilla/embedding/config/embed-jar.mn
index 3da26096b88..8adebbd7d27 100644
--- a/mozilla/embedding/config/embed-jar.mn
+++ b/mozilla/embedding/config/embed-jar.mn
@@ -42,8 +42,8 @@ locale/XXXX/necko/contents.rdf,                     XXXX/locale/XXXX/necko/conte
 locale/XXXX/necko/necko.properties,                 XXXX/locale/XXXX/necko/necko.properties
 locale/XXXX/necko/redirect_loop.dtd,                XXXX/locale/XXXX/necko/redirect_loop.dtd
 locale/XXXX/communicator/contents.rdf,              XXXX/locale/XXXX/communicator/contents.rdf
-locale/XXXX/communicator/security.properties,       XXXX/locale/XXXX/communicator/security.properties
-locale/XXXX/communicator/security/caps.properties,  XXXX/locale/XXXX/communicator/security/caps.properties
+locale/XXXX/global/security.properties,             XXXX/locale/XXXX/global/security.properties
+locale/XXXX/global/security/caps.properties,        XXXX/locale/XXXX/global/security/caps.properties
 locale/XXXX/navigator,                              XXXX/locale/XXXX/navigator
 locale/XXXX/navigator-platform,                     YYYY/locale/XXXX/navigator-platform
 locale/XXXX/global-platform,                        YYYY/locale/XXXX/global-platform
diff --git a/mozilla/extensions/webservices/security/src/jar.mn b/mozilla/extensions/webservices/security/src/jar.mn
deleted file mode 100644
index 3d2136430d4..00000000000
--- a/mozilla/extensions/webservices/security/src/jar.mn
+++ /dev/null
@@ -1,2 +0,0 @@
-en-US.jar:
-  locale/en-US/communicator/webservices/security.properties
diff --git a/mozilla/extensions/webservices/security/src/nsWSAUtils.cpp b/mozilla/extensions/webservices/security/src/nsWSAUtils.cpp
index fa7dfca13f5..0fbad640cd9 100755
--- a/mozilla/extensions/webservices/security/src/nsWSAUtils.cpp
+++ b/mozilla/extensions/webservices/security/src/nsWSAUtils.cpp
@@ -48,7 +48,7 @@
 #include "nsNetCID.h"
 
 static const char kSecurityProperties[] =
-  "chrome://communicator/locale/webservices/security.properties";
+  "chrome://global/locale/webservices/security.properties";
 static NS_DEFINE_CID(kDNSServiceCID, NS_DNSSERVICE_CID);
 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 
diff --git a/mozilla/parser/htmlparser/src/jar.mn b/mozilla/parser/htmlparser/src/jar.mn
deleted file mode 100644
index eff9719dfa6..00000000000
--- a/mozilla/parser/htmlparser/src/jar.mn
+++ /dev/null
@@ -1,2 +0,0 @@
-en-US.jar:
-	locale/en-US/communicator/layout/xmlparser.properties
diff --git a/mozilla/parser/htmlparser/src/nsParserMsgUtils.h b/mozilla/parser/htmlparser/src/nsParserMsgUtils.h
index be3203c4d5f..12a5e415000 100644
--- a/mozilla/parser/htmlparser/src/nsParserMsgUtils.h
+++ b/mozilla/parser/htmlparser/src/nsParserMsgUtils.h
@@ -40,7 +40,7 @@
 
 #include "nsString.h"
 
-#define XMLPARSER_PROPERTIES "chrome://communicator/locale/layout/xmlparser.properties"
+#define XMLPARSER_PROPERTIES "chrome://global/locale/layout/xmlparser.properties"
 
 class nsParserMsgUtils {
   nsParserMsgUtils();  // Currently this is not meant to be created, use the static methods