Fix multiple issues with ADM/ADMX templates

Correct descriptions in ADM/ADMX template and change registry key to "Chrome" from "Google Chrome".

Fix numerous punctuation, verbiage and wording issues.

Fix HomepageIsNewTabPage so that not checking the checkbox actually forces the hompage to the homepage URL.

BUG=none
TEST=manual

Review URL: http://codereview.chromium.org/2806040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51251 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 162 insertions, 103 deletions

diff --git a/chrome/app/policy/windows/adm/en-US/chrome.adm b/chrome/app/policy/windows/adm/en-US/chrome.adm
index 1cc7953..c302a75 100644
--- a/chrome/app/policy/windows/adm/en-US/chrome.adm
+++ b/chrome/app/policy/windows/adm/en-US/chrome.adm
@@ -8,7 +8,7 @@ CLASS MACHINE
     ;
     ; For example:  Software\Policies\Microsoft\Windows\Printing
 
-       KEYNAME "Software\Policies\Google\Google Chrome"
+       KEYNAME "Software\Policies\Google\Chrome"
 
     ; This is a simple policy that sets the homepage, or if the homepage should be
     ; the new tab page
@@ -20,12 +20,16 @@ CLASS MACHINE
            EXPLAIN !!HomePage_Explain
            VALUENAME "Homepage"
 
-           PART !!HomePageLocation          EDITTEXT
-              VALUENAME "HomepageLocation"
+           PART !!HomepageMode DROPDOWNLIST
+            VALUENAME "HomepageIsNewTabPage"
+            ITEMLIST
+              NAME !!HomepageIsLocationURL VALUE NUMERIC 0
+              NAME !!HomepageIsNewTabPage VALUE NUMERIC 1
+            END ITEMLIST
            END PART
 
-           PART !!HomePageIsNewTab          CHECKBOX
-              VALUENAME "HomepageIsNewTabPage"
+           PART !!HomepageLocation          EDITTEXT
+              VALUENAME "HomepageLocation"
            END PART
        END POLICY
 
@@ -125,40 +129,55 @@ CLASS MACHINE
 SUPPORTED_WINXPSP2="At least Microsoft Windows XP SP2"
 google="Google"
 googlechrome="Google Chrome"
-HomePage="Set the default home page."
-HomePage_Explain="This policy setting specifies the location of the default \
-home page for the user.\nThe homepage can either be set to a URL you specify, \
-or set to the New Tab Page.\n\n If the New Tab Page option is choosen, this \
-will override the URL location."
-HomePageLocation="The homepage URL."
-HomePageIsNewTab="Use the New Tab Page as the home page."
-Proxy="Override the proxy server settings."
-Proxy_Explain="This policy allows you to specify the proxy server used by \
-Google Chrome.\n\nIf you choose to disable the proxy server settings by \
-choosing always to use a direct connection, all other options will be \
-ignored.\n\nIf you specify a proxy server, the autodetect option will be \
-ignored.\n\nFor detailed examples, visit: http://www.chromium.org/developers\
-/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett"
-ProxyServer="The address of the proxy server.\n"
-ProxyServerMode="Choose how to specify proxy server settings"
-ProxyServerDisabled="Always use direct connections."
-ProxyServerAutoDetect="Auto detect the proxy settings."
-ProxyServerManual="Manually specify the proxy settings."
-ProxyServerUseSystem="Use the system proxy settings."
-ProxyBypassList="Comma separated list of bypass rules.\n"
-ProxyPacUrl="The url to a proxy pac file.\n"
-AlternateErrorPagesEnabled="Enable alternative error pages."
-AlternateErrorPagesEnabled_Explain="This policy disables the use of alternative error pages built \
-into Google Chrome (such as 'page not found'.)"
-SearchSuggestEnabled="Enable search suggestions."
-SearchSuggestEnabled_Explain="This policy enables search suggestions in the Omnibox."
-DnsPrefetchingEnabled="Enable search suggestions."
-DnsPrefetchingEnabled_Explain="This policy enables search suggestions in the Omnibox."
-SafeBrowsingEnabled="Enable safe browsing."
-SafeBrowsingEnabled_Explain="This policy enables Safe Browsing."
-MetricsReportingEnabled="Enable reporting of usage and crash related data."
-MetricsReportingEnabled_Explain="This policy enables the anonymous reporting of usage \
-and crash related data to Google."
-Sync="Disable syncronization of data with Google."
-Sync_Explain="This policy disables data synchronization using Google-hosted \
-sync services."
+HomePage="Configure default home page"
+HomePage_Explain="Configures the default home page and prevents users from changing homepage settings.\n\n\
+The homepage can either be set to a URL you specify or set to the New Tab Page.\n\n\
+If you specify the New Tab Page is specified as the homepage, the homepage URL location is ignored.\n\n\
+If you enable this setting, users cannot change their homepage settings in Google Chrome."
+HomepageMode="Homepage type:"
+HomepageIsLocationURL="Always use homepage URL as homepage"
+HomepageIsNewTabPage="Always use New Tab Page as homepage"
+HomepageLocation="Homepage URL:"
+Proxy="Configure proxy server"
+Proxy_Explain="Allows you to specify the proxy server used by Google Chrome and prevents users from changing proxy settings.\n\n\
+If you choose to never use a proxy server and always connect directly, \
+all other options will be ignored.\n\nIf you choose to auto detect the proxy server, all other \
+options will be ignored.\n\nFor detailed examples, visit: \
+http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett\n\n\
+If you enable this setting, Google Chrome will ignore all proxy-related options specified from the command line."
+ProxyServer="Address or URL of proxy server:"
+ProxyServerMode="Choose how to specify proxy server settings:"
+ProxyServerDisabled="Never use a proxy"
+ProxyServerAutoDetect="Auto detect proxy settings"
+ProxyServerManual="Manually specify proxy settings"
+ProxyServerUseSystem="Use system proxy settings"
+ProxyBypassList="Comma-separated list of bypass rules:"
+ProxyPacUrl="URL to a proxy .pac file:"
+AlternateErrorPagesEnabled="Enable alternate error pages"
+AlternateErrorPagesEnabled_Explain="Enables the use of alternate error pages that are built \
+into Google Chrome (such as 'page not found') and prevents users from changing this setting.\n\n\
+If you enable this setting, alternate error pages will be used.\n\n\
+If you disable this setting, alternate error pages will never be used.\n\n\
+If you enable or disable this setting, users cannot change or override this setting in Google Chrome."
+SearchSuggestEnabled="Enable search suggestions"
+SearchSuggestEnabled_Explain="Enables search suggestions in the Omnibox and prevents users from changing this setting.\n\n\
+If you enable this setting, search suggestions will be used.\n\n\
+If you disable this setting, search suggestions will never be used.\n\n\
+If you enable or disable this setting, users cannot change or override this setting in Google Chrome."
+DnsPrefetchingEnabled="Enable search suggestions"
+DnsPrefetchingEnabled_Explain="Enables DNS prefecthing and prevents users from changing this setting.\n\n\
+If you enable or disable this setting, users cannot change or override this setting in Google Chrome."
+SafeBrowsingEnabled="Enable Safe Browsing"
+SafeBrowsingEnabled_Explain="Enables and disables whether Google Chrome's Safe Browsing feature and prevents users from changing this setting.\n\n\
+If you enable this setting, Safe Browsing will always be active.\n\n\
+If you disable this setting, Safe Browsing will never be active.\n\n\
+If you enable or disable this setting, users cannot change or override this setting in Google Chrome."
+MetricsReportingEnabled="Enable reporting of usage and crash-related data"
+MetricsReportingEnabled_Explain="Enables the anonymous reporting of usage \
+and crash-related data to Google and prevents users from changing this setting.\n\n\
+If you enable this setting, anonymous reporting of usage and crash-related data will be sent to Google.\n\n\
+If you disable this setting, anonymous reporting of usage and crash-related data will never be sent to Google.\n\n\
+If you enable or disable this setting, users cannot change or override this setting in Google Chrome."
+Sync="Disallow synchronization of data with Google"
+Sync_Explain="Disallows data synchronization using Google-hosted sync services and prevents users from changing this setting.\n\n\
+If you enable this setting, users cannot change or override this setting in Google Chrome."
diff --git a/chrome/app/policy/windows/admx/chrome.admx b/chrome/app/policy/windows/admx/chrome.admx
index cfe8429..1ccf04c 100644
--- a/chrome/app/policy/windows/admx/chrome.admx
+++ b/chrome/app/policy/windows/admx/chrome.admx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <policyDefinitions revision="1.0" schemaVersion="1.0">

   <policyNamespaces>

-    <target prefix="fullarmor" namespace="FullArmor.a11efb4b-1ae1-445a-a00f-3a5a41df8794" />

+    <target prefix="fullarmor" namespace="FullArmor.4dd057b3-7d4f-4b0e-b832-fd4cd2c92884" />

     <using prefix="windows" namespace="Microsoft.Policies.Windows" />

   </policyNamespaces>

   <supersededAdm fileName="C:\Development\src\chrome\app\policy\windows\adm\en-US\chrome.adm" />

@@ -19,15 +19,26 @@
     </category>

   </categories>

   <policies>

-    <policy name="HomePage" class="Machine" displayName="$(string.HomePage)" explainText="$(string.HomePage_Explain)" presentation="$(presentation.HomePage)" key="Software\Policies\Google\Google Chrome" valueName="Homepage">

+    <policy name="HomePage" class="Machine" displayName="$(string.HomePage)" explainText="$(string.HomePage_Explain)" presentation="$(presentation.HomePage)" key="Software\Policies\Google\Chrome" valueName="Homepage">

       <parentCategory ref="googlechrome" />

       <supportedOn ref="SUPPORTED_WINXPSP2" />

       <elements>

-        <text id="HomePageLocation" valueName="HomepageLocation" />

-        <boolean id="HomePageIsNewTab" valueName="HomepageIsNewTabPage" />

+        <enum id="HomepageMode" valueName="HomepageIsNewTabPage">

+          <item displayName="$(string.HomepageIsLocationURL)">

+            <value>

+              <decimal value="0" />

+            </value>

+          </item>

+          <item displayName="$(string.HomepageIsNewTabPage)">

+            <value>

+              <decimal value="1" />

+            </value>

+          </item>

+        </enum>

+        <text id="HomepageLocation" valueName="HomepageLocation" />

       </elements>

     </policy>

-    <policy name="AlternateErrorPagesEnabled" class="Machine" displayName="$(string.AlternateErrorPagesEnabled)" explainText="$(string.AlternateErrorPagesEnabled_Explain)" presentation="$(presentation.AlternateErrorPagesEnabled)" key="Software\Policies\Google\Google Chrome" valueName="AlternateErrorPagesEnabled">

+    <policy name="AlternateErrorPagesEnabled" class="Machine" displayName="$(string.AlternateErrorPagesEnabled)" explainText="$(string.AlternateErrorPagesEnabled_Explain)" presentation="$(presentation.AlternateErrorPagesEnabled)" key="Software\Policies\Google\Chrome" valueName="AlternateErrorPagesEnabled">

       <parentCategory ref="googlechrome" />

       <supportedOn ref="SUPPORTED_WINXPSP2" />

       <enabledValue>

@@ -37,7 +48,7 @@
         <decimal value="0" />

       </disabledValue>

     </policy>

-    <policy name="SearchSuggestEnabled" class="Machine" displayName="$(string.SearchSuggestEnabled)" explainText="$(string.SearchSuggestEnabled_Explain)" presentation="$(presentation.SearchSuggestEnabled)" key="Software\Policies\Google\Google Chrome" valueName="SearchSuggestEnabled">

+    <policy name="SearchSuggestEnabled" class="Machine" displayName="$(string.SearchSuggestEnabled)" explainText="$(string.SearchSuggestEnabled_Explain)" presentation="$(presentation.SearchSuggestEnabled)" key="Software\Policies\Google\Chrome" valueName="SearchSuggestEnabled">

       <parentCategory ref="googlechrome" />

       <supportedOn ref="SUPPORTED_WINXPSP2" />

       <enabledValue>

@@ -47,7 +58,7 @@
         <decimal value="0" />

       </disabledValue>

     </policy>

-    <policy name="DnsPrefetchingEnabled" class="Machine" displayName="$(string.DnsPrefetchingEnabled)" explainText="$(string.DnsPrefetchingEnabled_Explain)" presentation="$(presentation.DnsPrefetchingEnabled)" key="Software\Policies\Google\Google Chrome" valueName="DnsPrefetchingEnabled">

+    <policy name="DnsPrefetchingEnabled" class="Machine" displayName="$(string.DnsPrefetchingEnabled)" explainText="$(string.DnsPrefetchingEnabled_Explain)" presentation="$(presentation.DnsPrefetchingEnabled)" key="Software\Policies\Google\Chrome" valueName="DnsPrefetchingEnabled">

       <parentCategory ref="googlechrome" />

       <supportedOn ref="SUPPORTED_WINXPSP2" />

       <enabledValue>

@@ -57,7 +68,7 @@
         <decimal value="0" />

       </disabledValue>

     </policy>

-    <policy name="SafeBrowsingEnabled" class="Machine" displayName="$(string.SafeBrowsingEnabled)" explainText="$(string.SafeBrowsingEnabled_Explain)" presentation="$(presentation.SafeBrowsingEnabled)" key="Software\Policies\Google\Google Chrome" valueName="SafeBrowsingEnabled">

+    <policy name="SafeBrowsingEnabled" class="Machine" displayName="$(string.SafeBrowsingEnabled)" explainText="$(string.SafeBrowsingEnabled_Explain)" presentation="$(presentation.SafeBrowsingEnabled)" key="Software\Policies\Google\Chrome" valueName="SafeBrowsingEnabled">

       <parentCategory ref="googlechrome" />

       <supportedOn ref="SUPPORTED_WINXPSP2" />

       <enabledValue>

@@ -67,7 +78,7 @@
         <decimal value="0" />

       </disabledValue>

     </policy>

-    <policy name="MetricsReportingEnabled" class="Machine" displayName="$(string.MetricsReportingEnabled)" explainText="$(string.MetricsReportingEnabled_Explain)" presentation="$(presentation.MetricsReportingEnabled)" key="Software\Policies\Google\Google Chrome" valueName="MetricsReportingEnabled">

+    <policy name="MetricsReportingEnabled" class="Machine" displayName="$(string.MetricsReportingEnabled)" explainText="$(string.MetricsReportingEnabled_Explain)" presentation="$(presentation.MetricsReportingEnabled)" key="Software\Policies\Google\Chrome" valueName="MetricsReportingEnabled">

       <parentCategory ref="googlechrome" />

       <supportedOn ref="SUPPORTED_WINXPSP2" />

       <enabledValue>

@@ -77,11 +88,11 @@
         <decimal value="0" />

       </disabledValue>

     </policy>

-    <policy name="Sync" class="Machine" displayName="$(string.Sync)" explainText="$(string.Sync_Explain)" presentation="$(presentation.Sync)" key="Software\Policies\Google\Google Chrome" valueName="SyncDisabled">

+    <policy name="Sync" class="Machine" displayName="$(string.Sync)" explainText="$(string.Sync_Explain)" presentation="$(presentation.Sync)" key="Software\Policies\Google\Chrome" valueName="SyncDisabled">

       <parentCategory ref="googlechrome" />

       <supportedOn ref="SUPPORTED_WINXPSP2" />

     </policy>

-    <policy name="Proxy" class="Machine" displayName="$(string.Proxy)" explainText="$(string.Proxy_Explain)" presentation="$(presentation.Proxy)" key="Software\Policies\Google\Google Chrome" valueName="Proxy">

+    <policy name="Proxy" class="Machine" displayName="$(string.Proxy)" explainText="$(string.Proxy_Explain)" presentation="$(presentation.Proxy)" key="Software\Policies\Google\Chrome" valueName="Proxy">

       <parentCategory ref="googlechrome" />

       <supportedOn ref="SUPPORTED_WINXPSP2" />

       <elements>

@@ -113,4 +124,4 @@
       </elements>

     </policy>

   </policies>

-</policyDefinitions>
\ No newline at end of file
+</policyDefinitions>

diff --git a/chrome/app/policy/windows/admx/en-US/chrome.adml b/chrome/app/policy/windows/admx/en-US/chrome.adml
index 81fd7f9..116715b 100644
--- a/chrome/app/policy/windows/admx/en-US/chrome.adml
+++ b/chrome/app/policy/windows/admx/en-US/chrome.adml
@@ -7,53 +7,85 @@
       <string id="SUPPORTED_WINXPSP2">At least Microsoft Windows XP SP2</string>

       <string id="google">Google</string>

       <string id="googlechrome">Google Chrome</string>

-      <string id="HomePage">Set the default home page.</string>

-      <string id="HomePage_Explain">This policy setting specifies the location of the default home page for the user.

-The homepage can either be set to a URL you specify, or set to the New Tab Page.

-

- If the New Tab Page option is choosen, this will override the URL location.</string>

-      <string id="HomePageLocation">The homepage URL.</string>

-      <string id="HomePageIsNewTab">Use the New Tab Page as the home page.</string>

-      <string id="Proxy">Override the proxy server settings.</string>

-      <string id="Proxy_Explain">This policy allows you to specify the proxy server used by Google Chrome.

-

-If you choose to disable the proxy server settings by choosing always to use a direct connection, all other options will be ignored.

-

-If you specify a proxy server, the autodetect option will be ignored.

-

-For detailed examples, visit: http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</string>

-      <string id="ProxyServer">The address of the proxy server.

-</string>

-      <string id="ProxyServerMode">Choose how to specify proxy server settings</string>

-      <string id="ProxyServerDisabled">Always use direct connections.</string>

-      <string id="ProxyServerAutoDetect">Auto detect the proxy settings.</string>

-      <string id="ProxyServerManual">Manually specify the proxy settings.</string>

-      <string id="ProxyServerUseSystem">Use the system proxy settings.</string>

-      <string id="ProxyBypassList">Comma separated list of bypass rules.

-</string>

-      <string id="ProxyPacUrl">The url to a proxy pac file.

-</string>

-      <string id="AlternateErrorPagesEnabled">Enable alternative error pages.</string>

-      <string id="AlternateErrorPagesEnabled_Explain">This policy disables the use of alternative error pages built into Google Chrome (such as 'page not found'.)</string>

-      <string id="SearchSuggestEnabled">Enable search suggestions.</string>

-      <string id="SearchSuggestEnabled_Explain">This policy enables search suggestions in the Omnibox.</string>

-      <string id="DnsPrefetchingEnabled">Enable search suggestions.</string>

-      <string id="DnsPrefetchingEnabled_Explain">This policy enables search suggestions in the Omnibox.</string>

-      <string id="SafeBrowsingEnabled">Enable safe browsing.</string>

-      <string id="SafeBrowsingEnabled_Explain">This policy enables Safe Browsing.</string>

-      <string id="MetricsReportingEnabled">Enable reporting of usage and crash related data.</string>

-      <string id="MetricsReportingEnabled_Explain">This policy enables the anonymous reporting of usage and crash related data to Google.</string>

-      <string id="Sync">Disable syncronization of data with Google.</string>

-      <string id="Sync_Explain">This policy disables data synchronization using Google-hosted sync services.</string>

+      <string id="HomePage">Configure default home page</string>

+      <string id="HomePage_Explain">Configures the default home page and prevents users from changing homepage settings.

+

+The homepage can either be set to a URL you specify or set to the New Tab Page.

+

+If you specify the New Tab Page is specified as the homepage, the homepage URL location is ignored.

+

+If you enable this setting, users cannot change their homepage settings in Google Chrome.</string>

+      <string id="HomepageMode">Homepage type:</string>

+      <string id="HomepageIsLocationURL">Always use homepage URL as homepage</string>

+      <string id="HomepageIsNewTabPage">Always use New Tab Page as homepage</string>

+      <string id="HomepageLocation">Homepage URL:</string>

+      <string id="Proxy">Configure proxy server</string>

+      <string id="Proxy_Explain">Allows you to specify the proxy server used by Google Chrome and prevents users from changing proxy settings.

+

+If you choose to never use a proxy server and always connect directly, all other options will be ignored.

+

+If you choose to auto detect the proxy server, all other options will be ignored.

+

+For detailed examples, visit: http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett

+

+If you enable this setting, Google Chrome will ignore all proxy-related options specified from the command line.</string>

+      <string id="ProxyServer">Address or URL of proxy server:</string>

+      <string id="ProxyServerMode">Choose how to specify proxy server settings:</string>

+      <string id="ProxyServerDisabled">Never use a proxy</string>

+      <string id="ProxyServerAutoDetect">Auto detect proxy settings</string>

+      <string id="ProxyServerManual">Manually specify proxy settings</string>

+      <string id="ProxyServerUseSystem">Use system proxy settings</string>

+      <string id="ProxyBypassList">Comma-separated list of bypass rules:</string>

+      <string id="ProxyPacUrl">URL to a proxy .pac file:</string>

+      <string id="AlternateErrorPagesEnabled">Enable alternate error pages</string>

+      <string id="AlternateErrorPagesEnabled_Explain">Enables the use of alternate error pages that are built into Google Chrome (such as 'page not found') and prevents users from changing this setting.

+

+If you enable this setting, alternate error pages will be used.

+

+If you disable this setting, alternate error pages will never be used.

+

+If you enable or disable this setting, users cannot change or override this setting in Google Chrome.</string>

+      <string id="SearchSuggestEnabled">Enable search suggestions</string>

+      <string id="SearchSuggestEnabled_Explain">Enables search suggestions in the Omnibox and prevents users from changing this setting.

+

+If you enable this setting, search suggestions will be used.

+

+If you disable this setting, search suggestions will never be used.

+

+If you enable or disable this setting, users cannot change or override this setting in Google Chrome.</string>

+      <string id="DnsPrefetchingEnabled">Enable search suggestions</string>

+      <string id="DnsPrefetchingEnabled_Explain">Enables DNS prefecthing and prevents users from changing this setting.

+

+If you enable or disable this setting, users cannot change or override this setting in Google Chrome.</string>

+      <string id="SafeBrowsingEnabled">Enable Safe Browsing</string>

+      <string id="SafeBrowsingEnabled_Explain">Enables and disables whether Google Chrome's Safe Browsing feature and prevents users from changing this setting.

+

+If you enable this setting, Safe Browsing will always be active.

+

+If you disable this setting, Safe Browsing will never be active.

+

+If you enable or disable this setting, users cannot change or override this setting in Google Chrome.</string>

+      <string id="MetricsReportingEnabled">Enable reporting of usage and crash-related data</string>

+      <string id="MetricsReportingEnabled_Explain">Enables the anonymous reporting of usage and crash-related data to Google and prevents users from changing this setting.

+

+If you enable this setting, anonymous reporting of usage and crash-related data will be sent to Google.

+

+If you disable this setting, anonymous reporting of usage and crash-related data will never be sent to Google.

+

+If you enable or disable this setting, users cannot change or override this setting in Google Chrome.</string>

+      <string id="Sync">Disallow synchronization of data with Google</string>

+      <string id="Sync_Explain">Disallows data synchronization using Google-hosted sync services and prevents users from changing this setting.

+

+If you enable this setting, users cannot change or override this setting in Google Chrome.</string>

       <string id="ADMXMigrator_UnresolvedString">ADMX Migrator encountered a string that is not present in the source ADM string table.</string>

       <string id="ADMXMigrator_NoSupportedOn">ADMX Migrator encountered a policy that does not have a supportedOn value.</string>

     </stringTable>

     <presentationTable>

       <presentation id="HomePage">

-        <textBox refId="HomePageLocation">

-          <label>The homepage URL.</label>

+        <dropdownList refId="HomepageMode">Homepage type:</dropdownList>

+        <textBox refId="HomepageLocation">

+          <label>Homepage URL:</label>

         </textBox>

-        <checkBox refId="HomePageIsNewTab">Use the New Tab Page as the home page.</checkBox>

       </presentation>

       <presentation id="AlternateErrorPagesEnabled" />

       <presentation id="SearchSuggestEnabled" />

@@ -62,18 +94,15 @@ For detailed examples, visit: http://www.chromium.org/developers/design-document
       <presentation id="MetricsReportingEnabled" />

       <presentation id="Sync" />

       <presentation id="Proxy">

-        <dropdownList refId="ProxyServerMode">Choose how to specify proxy server settings</dropdownList>

+        <dropdownList refId="ProxyServerMode">Choose how to specify proxy server settings:</dropdownList>

         <textBox refId="ProxyServer">

-          <label>The address of the proxy server.

-</label>

+          <label>Address or URL of proxy server:</label>

         </textBox>

         <textBox refId="ProxyPacUrl">

-          <label>The url to a proxy pac file.

-</label>

+          <label>URL to a proxy .pac file:</label>

         </textBox>

         <textBox refId="ProxyBypassList">

-          <label>Comma separated list of bypass rules.

-</label>

+          <label>Comma-separated list of bypass rules:</label>

         </textBox>

       </presentation>

     </presentationTable>

diff --git a/chrome/browser/configuration_policy_provider_win.cc b/chrome/browser/configuration_policy_provider_win.cc
index 420ff36..d39adeef 100644
--- a/chrome/browser/configuration_policy_provider_win.cc
+++ b/chrome/browser/configuration_policy_provider_win.cc
@@ -16,7 +16,7 @@
 
 #if defined(GOOGLE_CHROME_BUILD)
 const wchar_t ConfigurationPolicyProviderWin::kPolicyRegistrySubKey[] =
-    L"SOFTWARE\\Policies\\Google\\Google Chrome";
+    L"SOFTWARE\\Policies\\Google\\Chrome";
 #else
 const wchar_t ConfigurationPolicyProviderWin::kPolicyRegistrySubKey[] =
     L"SOFTWARE\\Policies\\Chromium";