bug 325473 - Undo separation of language and region/content packs, part 4: move pref panel into communictor pefs in suite/, correct installer manifests and fix rough edges of parts 1-3, r=bsmedberg for build system changes (removal of content-packs extension) r=ajschult for installer manifests r=jag sr=Neil

git-svn-id: svn://10.0.0.236/trunk@193936 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/embedding/config/embed-jar.mn

@@ -2,7 +2,7 @@
 # needs to include.
 #
 # Format is:
-# 
+#
 # <destination in embed.jar>,<source in unzipped chrome>
 #
 # Use XXXX for locale specific parts of the path.
@@ -52,7 +52,7 @@ locale/XXXX/global-platform,                        YYYY/locale/XXXX/global-plat
 locale/XXXX/global-platform/accessible.properties,  XXXX/locale/XXXX/global-platform/accessible.properties
 locale/XXXX/communicator/layout,                    XXXX/locale/XXXX/communicator/layout
 locale/XXXX/forms,                                  XXXX/locale/XXXX/forms
-locale/US/global-region,                            US/locale/US/global-region
+locale/XXXX/global-region,                          XXXX/locale/XXXX/global-region
 
 # Help stuff
 content/help, help/content/help,

mozilla/embedding/config/installed-chrome.txt

@@ -15,7 +15,7 @@ locale,install,url,jar:resource:/chrome/embed.jar!/locale/en-US/forms/
 skin,install,url,jar:resource:/chrome/embed.jar!/skin/classic/forms/
 skin,install,select,classic/1.0 
 content,install,url,jar:resource:/chrome/embed.jar!/content/global-region/
-locale,install,url,jar:resource:/chrome/embed.jar!/locale/US/global-region/
+locale,install,url,jar:resource:/chrome/embed.jar!/locale/en-US/global-region/
 content,install,url,jar:resource:/chrome/embed.jar!/content/global-platform/
 locale,install,url,jar:resource:/chrome/embed.jar!/locale/en-US/global-platform/
 content,install,url,jar:resource:/chrome/embed.jar!/content/cookie/