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

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

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
« no previous file with comments | « no previous file | chrome/app/policy/windows/admx/chrome.admx » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 CLASS MACHINE 1 CLASS MACHINE
2 2
3 CATEGORY !!google 3 CATEGORY !!google
4 CATEGORY !!googlechrome 4 CATEGORY !!googlechrome
5 5
6 ; Most applications will use a registry key with the naming convention 6 ; Most applications will use a registry key with the naming convention
7 ; Software\Policies\CompanyName\ProductName\ComponentName 7 ; Software\Policies\CompanyName\ProductName\ComponentName
8 ; 8 ;
9 ; For example: Software\Policies\Microsoft\Windows\Printing 9 ; For example: Software\Policies\Microsoft\Windows\Printing
10 10
11 KEYNAME "Software\Policies\Google\Google Chrome" 11 KEYNAME "Software\Policies\Google\Chrome"
12 12
13 ; This is a simple policy that sets the homepage, or if the homepage should be 13 ; This is a simple policy that sets the homepage, or if the homepage should be
14 ; the new tab page 14 ; the new tab page
15 15
16 POLICY !!HomePage 16 POLICY !!HomePage
17 #if version >= 4 17 #if version >= 4
18 SUPPORTED !!SUPPORTED_WINXPSP2 18 SUPPORTED !!SUPPORTED_WINXPSP2
19 #endif 19 #endif
20 EXPLAIN !!HomePage_Explain 20 EXPLAIN !!HomePage_Explain
21 VALUENAME "Homepage" 21 VALUENAME "Homepage"
22 22
23 PART !!HomePageLocation EDITTEXT 23 PART !!HomepageMode DROPDOWNLIST
24 VALUENAME "HomepageLocation" 24 VALUENAME "HomepageIsNewTabPage"
25 ITEMLIST
26 NAME !!HomepageIsLocationURL VALUE NUMERIC 0
27 NAME !!HomepageIsNewTabPage VALUE NUMERIC 1
28 END ITEMLIST
25 END PART 29 END PART
26 30
27 PART !!HomePageIsNewTab CHECKBOX 31 PART !!HomepageLocation EDITTEXT
28 VALUENAME "HomepageIsNewTabPage" 32 VALUENAME "HomepageLocation"
29 END PART 33 END PART
30 END POLICY 34 END POLICY
31 35
32 POLICY !!AlternateErrorPagesEnabled 36 POLICY !!AlternateErrorPagesEnabled
33 #if version >= 4 37 #if version >= 4
34 SUPPORTED !!SUPPORTED_WINXPSP2 38 SUPPORTED !!SUPPORTED_WINXPSP2
35 #endif 39 #endif
36 EXPLAIN !!AlternateErrorPagesEnabled_Explain 40 EXPLAIN !!AlternateErrorPagesEnabled_Explain
37 VALUENAME "AlternateErrorPagesEnabled" 41 VALUENAME "AlternateErrorPagesEnabled"
38 VALUEON NUMERIC 1 42 VALUEON NUMERIC 1
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 VALUENAME "ProxyBypassList" 122 VALUENAME "ProxyBypassList"
119 END PART 123 END PART
120 END POLICY 124 END POLICY
121 END CATEGORY 125 END CATEGORY
122 END CATEGORY 126 END CATEGORY
123 127
124 [Strings] 128 [Strings]
125 SUPPORTED_WINXPSP2="At least Microsoft Windows XP SP2" 129 SUPPORTED_WINXPSP2="At least Microsoft Windows XP SP2"
126 google="Google" 130 google="Google"
127 googlechrome="Google Chrome" 131 googlechrome="Google Chrome"
128 HomePage="Set the default home page." 132 HomePage="Configure default home page"
129 HomePage_Explain="This policy setting specifies the location of the default \ 133 HomePage_Explain="Configures the default home page and prevents users from chang ing homepage settings.\n\n\
130 home page for the user.\nThe homepage can either be set to a URL you specify, \ 134 The homepage can either be set to a URL you specify or set to the New Tab Page.\ n\n\
131 or set to the New Tab Page.\n\n If the New Tab Page option is choosen, this \ 135 If you specify the New Tab Page is specified as the homepage, the homepage URL l ocation is ignored.\n\n\
132 will override the URL location." 136 If you enable this setting, users cannot change their homepage settings in Googl e Chrome."
133 HomePageLocation="The homepage URL." 137 HomepageMode="Homepage type:"
134 HomePageIsNewTab="Use the New Tab Page as the home page." 138 HomepageIsLocationURL="Always use homepage URL as homepage"
135 Proxy="Override the proxy server settings." 139 HomepageIsNewTabPage="Always use New Tab Page as homepage"
136 Proxy_Explain="This policy allows you to specify the proxy server used by \ 140 HomepageLocation="Homepage URL:"
137 Google Chrome.\n\nIf you choose to disable the proxy server settings by \ 141 Proxy="Configure proxy server"
138 choosing always to use a direct connection, all other options will be \ 142 Proxy_Explain="Allows you to specify the proxy server used by Google Chrome and prevents users from changing proxy settings.\n\n\
139 ignored.\n\nIf you specify a proxy server, the autodetect option will be \ 143 If you choose to never use a proxy server and always connect directly, \
140 ignored.\n\nFor detailed examples, visit: http://www.chromium.org/developers\ 144 all other options will be ignored.\n\nIf you choose to auto detect the proxy ser ver, all other \
141 /design-documents/network-settings#TOC-Command-line-options-for-proxy-sett" 145 options will be ignored.\n\nFor detailed examples, visit: \
142 ProxyServer="The address of the proxy server.\n" 146 http://www.chromium.org/developers/design-documents/network-settings#TOC-Command -line-options-for-proxy-sett\n\n\
143 ProxyServerMode="Choose how to specify proxy server settings" 147 If you enable this setting, Google Chrome will ignore all proxy-related options specified from the command line."
144 ProxyServerDisabled="Always use direct connections." 148 ProxyServer="Address or URL of proxy server:"
145 ProxyServerAutoDetect="Auto detect the proxy settings." 149 ProxyServerMode="Choose how to specify proxy server settings:"
146 ProxyServerManual="Manually specify the proxy settings." 150 ProxyServerDisabled="Never use a proxy"
147 ProxyServerUseSystem="Use the system proxy settings." 151 ProxyServerAutoDetect="Auto detect proxy settings"
148 ProxyBypassList="Comma separated list of bypass rules.\n" 152 ProxyServerManual="Manually specify proxy settings"
149 ProxyPacUrl="The url to a proxy pac file.\n" 153 ProxyServerUseSystem="Use system proxy settings"
150 AlternateErrorPagesEnabled="Enable alternative error pages." 154 ProxyBypassList="Comma-separated list of bypass rules:"
151 AlternateErrorPagesEnabled_Explain="This policy disables the use of alternative error pages built \ 155 ProxyPacUrl="URL to a proxy .pac file:"
152 into Google Chrome (such as 'page not found'.)" 156 AlternateErrorPagesEnabled="Enable alternate error pages"
153 SearchSuggestEnabled="Enable search suggestions." 157 AlternateErrorPagesEnabled_Explain="Enables the use of alternate error pages tha t are built \
154 SearchSuggestEnabled_Explain="This policy enables search suggestions in the Omni box." 158 into Google Chrome (such as 'page not found') and prevents users from changing t his setting.\n\n\
155 DnsPrefetchingEnabled="Enable search suggestions." 159 If you enable this setting, alternate error pages will be used.\n\n\
156 DnsPrefetchingEnabled_Explain="This policy enables search suggestions in the Omn ibox." 160 If you disable this setting, alternate error pages will never be used.\n\n\
157 SafeBrowsingEnabled="Enable safe browsing." 161 If you enable or disable this setting, users cannot change or override this sett ing in Google Chrome."
158 SafeBrowsingEnabled_Explain="This policy enables Safe Browsing." 162 SearchSuggestEnabled="Enable search suggestions"
159 MetricsReportingEnabled="Enable reporting of usage and crash related data." 163 SearchSuggestEnabled_Explain="Enables search suggestions in the Omnibox and prev ents users from changing this setting.\n\n\
160 MetricsReportingEnabled_Explain="This policy enables the anonymous reporting of usage \ 164 If you enable this setting, search suggestions will be used.\n\n\
161 and crash related data to Google." 165 If you disable this setting, search suggestions will never be used.\n\n\
162 Sync="Disable syncronization of data with Google." 166 If you enable or disable this setting, users cannot change or override this sett ing in Google Chrome."
163 Sync_Explain="This policy disables data synchronization using Google-hosted \ 167 DnsPrefetchingEnabled="Enable search suggestions"
164 sync services." 168 DnsPrefetchingEnabled_Explain="Enables DNS prefecthing and prevents users from c hanging this setting.\n\n\
169 If you enable or disable this setting, users cannot change or override this sett ing in Google Chrome."
170 SafeBrowsingEnabled="Enable Safe Browsing"
171 SafeBrowsingEnabled_Explain="Enables and disables whether Google Chrome's Safe B rowsing feature and prevents users from changing this setting.\n\n\
172 If you enable this setting, Safe Browsing will always be active.\n\n\
173 If you disable this setting, Safe Browsing will never be active.\n\n\
174 If you enable or disable this setting, users cannot change or override this sett ing in Google Chrome."
175 MetricsReportingEnabled="Enable reporting of usage and crash-related data"
176 MetricsReportingEnabled_Explain="Enables the anonymous reporting of usage \
177 and crash-related data to Google and prevents users from changing this setting.\ n\n\
178 If you enable this setting, anonymous reporting of usage and crash-related data will be sent to Google.\n\n\
179 If you disable this setting, anonymous reporting of usage and crash-related data will never be sent to Google.\n\n\
180 If you enable or disable this setting, users cannot change or override this sett ing in Google Chrome."
181 Sync="Disallow synchronization of data with Google"
182 Sync_Explain="Disallows data synchronization using Google-hosted sync services a nd prevents users from changing this setting.\n\n\
183 If you enable this setting, users cannot change or override this setting in Goog le Chrome."
OLDNEW
« no previous file with comments | « no previous file | chrome/app/policy/windows/admx/chrome.admx » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698