From f157c45053cc49e8aa73075aa8afaec5001af2d6 Mon Sep 17 00:00:00 2001
From: "tao%netscape.com"
 <tao%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 14 Sep 2006 05:51:38 +0000
Subject: [PATCH] 45262 Check-In "View | Set Language/Region" code to better 
 expose the Counrty Picker feature to user.r=ftang

git-svn-id: svn://10.0.0.236/trunk@210402 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/browser/navigatorOverlay.xul    | 42 ++++++++++---------
 .../en-US/chrome/browser/navigator.dtd        |  1 +
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul
index e33df50e2fd..606a43a0655 100644
--- a/mozilla/suite/browser/navigatorOverlay.xul
+++ b/mozilla/suite/browser/navigatorOverlay.xul
@@ -229,8 +229,29 @@ Contributor(s): ______________________________________. -->
       <menuitem value="&pageInfoCmd.label;" oncommand="BrowserPageInfo();"/>
       <menuseparator />
       <menuitem value="&translateMenu.label;" oncommand="Translate();"/>
-      <menuitem value="&webContentMenu.label;" 
-                oncommand="loadXURL('urn:clienturl:viewmenu:intlwebcontent');"/>
+      <menu value="&webContentMenu.label;" 
+            datasources="rdf:chrome" 
+            ref="urn:mozilla:locale:root" 
+            sortResource="http://www.mozilla.org/rdf/chrome#name"
+            sortDirection="ascending" 
+            >
+        <template>
+          <rule>
+            <menupopup>
+              <menuitem class="standrad" uri="rdf:*" 
+                        value="rdf:http://www.mozilla.org/rdf/chrome#displayName"
+                        data="rdf:http://www.mozilla.org/rdf/chrome#name" 
+                        oncommand="selectLocale(event)" />
+            </menupopup>
+          </rule>
+         </template>
+
+       <menupopup sortStaticsLast="true" >
+          <menuseparator />
+          <menuitem value="&downloadMore.label;" 
+                    oncommand="loadXURL('urn:clienturl:viewmenu:intlwebcontent');"/>
+       </menupopup>
+      </menu>
 
       <menuseparator />
 <!-- Deprecated BEGIN
@@ -467,23 +488,6 @@ END of Deprecated -->
       <menuseparator />
       <menuitem value="&strresCmd.label;"       oncommand="window._content.location.href='resource:/res/strres-test.xul'"/>
 
-      <menu value="&languages.label;" 
-            datasources="rdf:chrome" 
-            ref="urn:mozilla:locale:root" 
-            sortResource="http://www.mozilla.org/rdf/chrome#name"
-            sortDirection="ascending">
-		<template>
-		  <rule>
-            <menupopup>
-			  <menuitem class="standrad" uri="rdf:*" 
-                        value="rdf:http://www.mozilla.org/rdf/chrome#displayName"
-                        data="rdf:http://www.mozilla.org/rdf/chrome#name" 
-                        oncommand="selectLocale(event)" />
-            </menupopup>
-          </rule>
-		</template>
-      </menu>
-
       <menuseparator />
       <menuitem value="&BloatDumpNewCmd.label;" oncommand="window._content.location.href='about:bloat?new'"/>
       <menuitem value="&BloatDumpAllCmd.label;" oncommand="window._content.location.href='about:bloat'"/>
diff --git a/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd b/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
index 33ce755a087..5c5c1d83c49 100644
--- a/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -62,6 +62,7 @@
 <!ENTITY pageInfoCmd.label "Page Info">
 <!ENTITY translateMenu.label "Translate">
 <!ENTITY webContentMenu.label "Languages and Web Content">
+<!ENTITY downloadMore.label "Download More">
 <!ENTITY dcharMenu.label "Character Set  ISO">
 <!ENTITY dcharMenu1.label "Character Set  Multibyte">
 <!ENTITY dcharMenu2.label "Character Set  Cyrillic">