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

chrome/app/policy/windows/admx/en-US/chrome.adml

Index: chrome/app/policy/windows/admx/en-US/chrome.adml
diff --git a/chrome/app/policy/windows/admx/en-US/chrome.adml b/chrome/app/policy/windows/admx/en-US/chrome.adml
index 81fd7f99b731fd88ad79cfbccd9c6db4397b5a96..116715bce63c376a9f228debde98cbe8b308328f 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>