Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Side by Side Diff: chrome/app/policy/windows/admx/en-US/chrome.adml

Issue 2806040: Correct description in ADM/ADMX template and change registry key to "Chrome" from "Google Chrome" (Closed)
Patch Set: fix registry key name Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <policyDefinitionResources revision="1.0" schemaVersion="1.0"> 2 <policyDefinitionResources revision="1.0" schemaVersion="1.0">
3 <displayName></displayName> 3 <displayName></displayName>
4 <description></description> 4 <description></description>
5 <resources> 5 <resources>
6 <stringTable> 6 <stringTable>
7 <string id="SUPPORTED_WINXPSP2">At least Microsoft Windows XP SP2</string> 7 <string id="SUPPORTED_WINXPSP2">At least Microsoft Windows XP SP2</string>
8 <string id="google">Google</string> 8 <string id="google">Google</string>
9 <string id="googlechrome">Google Chrome</string> 9 <string id="googlechrome">Google Chrome</string>
10 <string id="HomePage">Set the default home page.</string> 10 <string id="HomePage">Configure default home page</string>
11 <string id="HomePage_Explain">This policy setting specifies the location o f the default home page for the user. 11 <string id="HomePage_Explain">Configures the default home page and prevent s users from changing homepage settings.
12 The homepage can either be set to a URL you specify, or set to the New Tab Page.
13 12
14 If the New Tab Page option is choosen, this will override the URL location.</st ring> 13 The homepage can either be set to a URL you specify or set to the New Tab Page.
15 <string id="HomePageLocation">The homepage URL.</string>
16 <string id="HomePageIsNewTab">Use the New Tab Page as the home page.</stri ng>
17 <string id="Proxy">Override the proxy server settings.</string>
18 <string id="Proxy_Explain">This policy allows you to specify the proxy ser ver used by Google Chrome.
19 14
20 If you choose to disable the proxy server settings by choosing always to use a d irect connection, all other options will be ignored. 15 If you specify the New Tab Page is specified as the homepage, the homepage URL l ocation is ignored.
21 16
22 If you specify a proxy server, the autodetect option will be ignored. 17 If you enable this setting, users cannot change their homepage settings in Googl e Chrome.</string>
18 <string id="HomepageMode">Homepage type:</string>
19 <string id="HomepageIsLocationURL">Always use homepage URL as homepage</st ring>
20 <string id="HomepageIsNewTabPage">Always use New Tab Page as homepage</str ing>
21 <string id="HomepageLocation">Homepage URL:</string>
22 <string id="Proxy">Configure proxy server</string>
23 <string id="Proxy_Explain">Allows you to specify the proxy server used by Google Chrome and prevents users from changing proxy settings.
23 24
24 For detailed examples, visit: http://www.chromium.org/developers/design-document s/network-settings#TOC-Command-line-options-for-proxy-sett</string> 25 If you choose to never use a proxy server and always connect directly, all other options will be ignored.
25 <string id="ProxyServer">The address of the proxy server. 26
26 </string> 27 If you choose to auto detect the proxy server, all other options will be ignored .
27 <string id="ProxyServerMode">Choose how to specify proxy server settings</ string> 28
28 <string id="ProxyServerDisabled">Always use direct connections.</string> 29 For detailed examples, visit: http://www.chromium.org/developers/design-document s/network-settings#TOC-Command-line-options-for-proxy-sett
29 <string id="ProxyServerAutoDetect">Auto detect the proxy settings.</string > 30
30 <string id="ProxyServerManual">Manually specify the proxy settings.</strin g> 31 If you enable this setting, Google Chrome will ignore all proxy-related options specified from the command line.</string>
31 <string id="ProxyServerUseSystem">Use the system proxy settings.</string> 32 <string id="ProxyServer">Address or URL of proxy server:</string>
32 <string id="ProxyBypassList">Comma separated list of bypass rules. 33 <string id="ProxyServerMode">Choose how to specify proxy server settings:< /string>
33 </string> 34 <string id="ProxyServerDisabled">Never use a proxy</string>
34 <string id="ProxyPacUrl">The url to a proxy pac file. 35 <string id="ProxyServerAutoDetect">Auto detect proxy settings</string>
35 </string> 36 <string id="ProxyServerManual">Manually specify proxy settings</string>
36 <string id="AlternateErrorPagesEnabled">Enable alternative error pages.</s tring> 37 <string id="ProxyServerUseSystem">Use system proxy settings</string>
37 <string id="AlternateErrorPagesEnabled_Explain">This policy disables the u se of alternative error pages built into Google Chrome (such as 'page not found' .)</string> 38 <string id="ProxyBypassList">Comma-separated list of bypass rules:</string >
38 <string id="SearchSuggestEnabled">Enable search suggestions.</string> 39 <string id="ProxyPacUrl">URL to a proxy .pac file:</string>
39 <string id="SearchSuggestEnabled_Explain">This policy enables search sugge stions in the Omnibox.</string> 40 <string id="AlternateErrorPagesEnabled">Enable alternate error pages</stri ng>
40 <string id="DnsPrefetchingEnabled">Enable search suggestions.</string> 41 <string id="AlternateErrorPagesEnabled_Explain">Enables the use of alterna te error pages that are built into Google Chrome (such as 'page not found') and prevents users from changing this setting.
41 <string id="DnsPrefetchingEnabled_Explain">This policy enables search sugg estions in the Omnibox.</string> 42
42 <string id="SafeBrowsingEnabled">Enable safe browsing.</string> 43 If you enable this setting, alternate error pages will be used.
43 <string id="SafeBrowsingEnabled_Explain">This policy enables Safe Browsing .</string> 44
44 <string id="MetricsReportingEnabled">Enable reporting of usage and crash r elated data.</string> 45 If you disable this setting, alternate error pages will never be used.
45 <string id="MetricsReportingEnabled_Explain">This policy enables the anony mous reporting of usage and crash related data to Google.</string> 46
46 <string id="Sync">Disable syncronization of data with Google.</string> 47 If you enable or disable this setting, users cannot change or override this sett ing in Google Chrome.</string>
47 <string id="Sync_Explain">This policy disables data synchronization using Google-hosted sync services.</string> 48 <string id="SearchSuggestEnabled">Enable search suggestions</string>
49 <string id="SearchSuggestEnabled_Explain">Enables search suggestions in th e Omnibox and prevents users from changing this setting.
50
51 If you enable this setting, search suggestions will be used.
52
53 If you disable this setting, search suggestions will never be used.
54
55 If you enable or disable this setting, users cannot change or override this sett ing in Google Chrome.</string>
56 <string id="DnsPrefetchingEnabled">Enable search suggestions</string>
57 <string id="DnsPrefetchingEnabled_Explain">Enables DNS prefecthing and pre vents users from changing this setting.
58
59 If you enable or disable this setting, users cannot change or override this sett ing in Google Chrome.</string>
60 <string id="SafeBrowsingEnabled">Enable Safe Browsing</string>
61 <string id="SafeBrowsingEnabled_Explain">Enables and disables whether Goog le Chrome's Safe Browsing feature and prevents users from changing this setting.
62
63 If you enable this setting, Safe Browsing will always be active.
64
65 If you disable this setting, Safe Browsing will never be active.
66
67 If you enable or disable this setting, users cannot change or override this sett ing in Google Chrome.</string>
68 <string id="MetricsReportingEnabled">Enable reporting of usage and crash-r elated data</string>
69 <string id="MetricsReportingEnabled_Explain">Enables the anonymous reporti ng of usage and crash-related data to Google and prevents users from changing th is setting.
70
71 If you enable this setting, anonymous reporting of usage and crash-related data will be sent to Google.
72
73 If you disable this setting, anonymous reporting of usage and crash-related data will never be sent to Google.
74
75 If you enable or disable this setting, users cannot change or override this sett ing in Google Chrome.</string>
76 <string id="Sync">Disallow synchronization of data with Google</string>
77 <string id="Sync_Explain">Disallows data synchronization using Google-host ed sync services and prevents users from changing this setting.
78
79 If you enable this setting, users cannot change or override this setting in Goog le Chrome.</string>
48 <string id="ADMXMigrator_UnresolvedString">ADMX Migrator encountered a str ing that is not present in the source ADM string table.</string> 80 <string id="ADMXMigrator_UnresolvedString">ADMX Migrator encountered a str ing that is not present in the source ADM string table.</string>
49 <string id="ADMXMigrator_NoSupportedOn">ADMX Migrator encountered a policy that does not have a supportedOn value.</string> 81 <string id="ADMXMigrator_NoSupportedOn">ADMX Migrator encountered a policy that does not have a supportedOn value.</string>
50 </stringTable> 82 </stringTable>
51 <presentationTable> 83 <presentationTable>
52 <presentation id="HomePage"> 84 <presentation id="HomePage">
53 <textBox refId="HomePageLocation"> 85 <dropdownList refId="HomepageMode">Homepage type:</dropdownList>
54 <label>The homepage URL.</label> 86 <textBox refId="HomepageLocation">
87 <label>Homepage URL:</label>
55 </textBox> 88 </textBox>
56 <checkBox refId="HomePageIsNewTab">Use the New Tab Page as the home page .</checkBox>
57 </presentation> 89 </presentation>
58 <presentation id="AlternateErrorPagesEnabled" /> 90 <presentation id="AlternateErrorPagesEnabled" />
59 <presentation id="SearchSuggestEnabled" /> 91 <presentation id="SearchSuggestEnabled" />
60 <presentation id="DnsPrefetchingEnabled" /> 92 <presentation id="DnsPrefetchingEnabled" />
61 <presentation id="SafeBrowsingEnabled" /> 93 <presentation id="SafeBrowsingEnabled" />
62 <presentation id="MetricsReportingEnabled" /> 94 <presentation id="MetricsReportingEnabled" />
63 <presentation id="Sync" /> 95 <presentation id="Sync" />
64 <presentation id="Proxy"> 96 <presentation id="Proxy">
65 <dropdownList refId="ProxyServerMode">Choose how to specify proxy server settings</dropdownList> 97 <dropdownList refId="ProxyServerMode">Choose how to specify proxy server settings:</dropdownList>
66 <textBox refId="ProxyServer"> 98 <textBox refId="ProxyServer">
67 <label>The address of the proxy server. 99 <label>Address or URL of proxy server:</label>
68 </label>
69 </textBox> 100 </textBox>
70 <textBox refId="ProxyPacUrl"> 101 <textBox refId="ProxyPacUrl">
71 <label>The url to a proxy pac file. 102 <label>URL to a proxy .pac file:</label>
72 </label>
73 </textBox> 103 </textBox>
74 <textBox refId="ProxyBypassList"> 104 <textBox refId="ProxyBypassList">
75 <label>Comma separated list of bypass rules. 105 <label>Comma-separated list of bypass rules:</label>
76 </label>
77 </textBox> 106 </textBox>
78 </presentation> 107 </presentation>
79 </presentationTable> 108 </presentationTable>
80 </resources> 109 </resources>
81 </policyDefinitionResources> 110 </policyDefinitionResources>
OLDNEW
« no previous file with comments | « chrome/app/policy/windows/admx/chrome.admx ('k') | chrome/browser/configuration_policy_provider_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698