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

Side by Side Diff: chrome/app/policy/policy_templates.grd

Issue 5958014: Policy: Add ProxyMode and deprecate ProxyServerMode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: small tweaks Created 9 years, 11 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 | Annotate | Revision Log
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <!-- This file contains definitions of resources that are used in policy 3 <!-- This file contains definitions of resources that are used in policy
4 templates and will be translated for each locale. --> 4 templates and will be translated for each locale. -->
5 5
6 <grit base_dir="." latest_public_release="0" current_release="1" 6 <grit base_dir="." latest_public_release="0" current_release="1"
7 source_lang_id="en" enc_check="möl"> 7 source_lang_id="en" enc_check="möl">
8 <outputs> 8 <outputs>
9 <output filename="app/policy/windows/admx/chrome.admx" type="admx" lang="en" /> 9 <output filename="app/policy/windows/admx/chrome.admx" type="admx" lang="en" />
10 <output filename="app/policy/windows/admx/en-US/chrome.adml" type="adml" lan g="en" /> 10 <output filename="app/policy/windows/admx/en-US/chrome.adml" type="adml" lan g="en" />
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 If you choose to never use a proxy server and always connect directly, all other options are ignored. 279 If you choose to never use a proxy server and always connect directly, all other options are ignored.
280 280
281 If you choose to auto detect the proxy server, all other options are ignor ed. 281 If you choose to auto detect the proxy server, all other options are ignor ed.
282 282
283 For detailed examples, visit: 283 For detailed examples, visit:
284 <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design- documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph> 284 <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design- documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>
285 285
286 If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</e x></ph> ignores all proxy-related options specified from the command line. 286 If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</e x></ph> ignores all proxy-related options specified from the command line.
287 </message> 287 </message>
288 <message name="IDS_POLICY_PROXYMODE_CAPTION" desc="Text describing the dropd own menu for selecting proxy server mode in the 'proxy' policy settings page.">
289 Choose how to specify proxy server settings
290 </message>
291 <message name="IDS_POLICY_ENUM_PROXYDISABLED_CAPTION" desc="Label in the 'pr oxy server mode' dropdown menu for selecting no proxy server.">
292 Never use a proxy
293 </message>
294 <message name="IDS_POLICY_ENUM_PROXYAUTODETECT_CAPTION" desc="Label in the ' proxy server mode' dropdown menu for selecting to auto-detect proxy settings.">
295 Auto detect proxy settings
296 </message>
297 <message name="IDS_POLICY_ENUM_PROXYPACSCRIPT_CAPTION" desc="Label in the 'p roxy server mode' dropdown menu for selecting pac script proxy settings.">
298 Use a .pac proxy script
299 </message>
300 <message name="IDS_POLICY_ENUM_PROXYFIXEDSERVERS_CAPTION" desc="Label in the 'proxy server mode' dropdown menu for selecting fixed server proxy settings.">
301 Use a fixed proxy server
battre 2011/01/03 13:19:16 There can be more than one proxy server (one for h
danno 2011/01/07 12:24:25 Done.
danno 2011/01/07 12:24:25 Done.
302 </message>
303 <message name="IDS_POLICY_ENUM_PROXYUSESYSTEM_CAPTION" desc="Label in the 'p roxy server mode' dropdown menu for selecting to use system proxy settings.">
304 Use system proxy settings
305 </message>
288 <message name="IDS_POLICY_PROXYSERVERMODE_CAPTION" desc="Text describing the dropdown menu for selecting proxy server mode in the 'proxy' policy settings pa ge."> 306 <message name="IDS_POLICY_PROXYSERVERMODE_CAPTION" desc="Text describing the dropdown menu for selecting proxy server mode in the 'proxy' policy settings pa ge.">
289 Choose how to specify proxy server settings 307 Choose how to specify proxy server settings
290 </message> 308 </message>
291 <message name="IDS_POLICY_ENUM_PROXYSERVERDISABLED_CAPTION" desc="Label in t he 'proxy server mode' dropdown menu for selecting no proxy server."> 309 <message name="IDS_POLICY_ENUM_PROXYSERVERDISABLED_CAPTION" desc="Label in t he 'proxy server mode' dropdown menu for selecting no proxy server.">
292 Never use a proxy 310 Never use a proxy
293 </message> 311 </message>
294 <message name="IDS_POLICY_ENUM_PROXYSERVERAUTODETECT_CAPTION" desc="Label in the 'proxy server mode' dropdown menu for selecting to auto-detect proxy settin gs."> 312 <message name="IDS_POLICY_ENUM_PROXYSERVERAUTODETECT_CAPTION" desc="Label in the 'proxy server mode' dropdown menu for selecting to auto-detect proxy settin gs.">
295 Auto detect proxy settings 313 Auto detect proxy settings
296 </message> 314 </message>
297 <message name="IDS_POLICY_ENUM_PROXYSERVERMANUAL_CAPTION" desc="Label in the 'proxy server mode' dropdown menu for selecting manual proxy settings."> 315 <message name="IDS_POLICY_ENUM_PROXYSERVERMANUAL_CAPTION" desc="Label in the 'proxy server mode' dropdown menu for selecting manual proxy settings.">
298 Manually specify proxy settings 316 Manually specify proxy settings
299 </message> 317 </message>
300 <message name="IDS_POLICY_ENUM_PROXYSERVERUSESYSTEM_CAPTION" desc="Label in the 'proxy server mode' dropdown menu for selecting to use system proxy settings ."> 318 <message name="IDS_POLICY_ENUM_PROXYSERVERUSESYSTEM_CAPTION" desc="Label in the 'proxy server mode' dropdown menu for selecting to use system proxy settings .">
301 Use system proxy settings 319 Use system proxy settings
302 </message> 320 </message>
303 <message name="IDS_POLICY_PROXYSERVER_CAPTION" desc="The label of the 'proxy server address' text field in the 'proxy' policy settings page."> 321 <message name="IDS_POLICY_PROXYSERVER_CAPTION" desc="The label of the 'proxy server address' text field in the 'proxy' policy settings page.">
304 Address or URL of proxy server 322 Address or URL of proxy server
305 </message> 323 </message>
306 <message name="IDS_POLICY_PROXYBYPASSLIST_CAPTION" desc="The label of the 'p roxy bypass rules' text field in the 'proxy' policy settings page."> 324 <message name="IDS_POLICY_PROXYBYPASSLIST_CAPTION" desc="The label of the 'p roxy bypass rules' text field in the 'proxy' policy settings page.">
307 Proxy bypass rules 325 Proxy bypass rules
308 </message> 326 </message>
309 <message name="IDS_POLICY_PROXYBYPASSLIST_LABEL" desc="The label of the 'pro xy bypass rules' text field in the 'proxy' policy settings page."> 327 <message name="IDS_POLICY_PROXYBYPASSLIST_LABEL" desc="The label of the 'pro xy bypass rules' text field in the 'proxy' policy settings page.">
310 Comma-separated list of proxy bypass rules 328 Comma-separated list of proxy bypass rules
311 </message> 329 </message>
312 <message name="IDS_POLICY_PROXYPACURL_CAPTION" desc="The label of the 'proxy pac URL' text field in the 'proxy' policy settings page."> 330 <message name="IDS_POLICY_PROXYPACURL_CAPTION" desc="The label of the 'proxy pac URL' text field in the 'proxy' policy settings page.">
313 URL to a proxy .pac file 331 URL to a proxy .pac file
314 </message> 332 </message>
315 <message name="IDS_POLICY_PROXYSERVERMODE_DESC" desc="The description of the 'proxy bypass rules' policy when displayed in OSX Workgroup Manager."> 333 <message name="IDS_POLICY_PROXYMODE_DESC" desc="The description of the 'prox y bypass rules' policy when displayed in OSX Workgroup Manager.">
battre 2011/01/03 13:19:16 update the desc="..."?
danno 2011/01/07 12:24:25 Done.
316 Allows you to specify the proxy server used by <ph name="PRODUCT_NAME">$1< ex>Google Chrome</ex></ph> and prevents users from changing proxy settings. 334 Allows you to specify the proxy server used by <ph name="PRODUCT_NAME">$1< ex>Google Chrome</ex></ph> and prevents users from changing proxy settings.
317 335
318 If you choose to never use a proxy server and always connect directly, all other options are ignored. 336 If you choose to never use a proxy server and always connect directly, all other options are ignored.
337
338 If you choose to use system proxy settings or auto detect the proxy server , all other options are ignored.
339
340 If you choose fixed server proxy mode, you can specify further options in 'Address or URL of proxy server' and 'Comma-separated list of proxy bypass rules '.
341
342 If you choose to use a .pac proxy script, you must specify the URL to the script in 'URL to a proxy .pac file'.
343
344 For detailed examples, visit:
345 <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design- documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>
346
347 If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</e x></ph> ignores all proxy-related options specified from the command line.
348 </message>
349 <message name="IDS_POLICY_PROXYSERVERMODE_DESC" desc="The description of the 'proxy mode">
battre 2011/01/03 13:19:16 nit: missing ' after proxy mode
danno 2011/01/07 12:24:25 Done.
350 This policy is deprecated, use ProxyMode instead.
351
352 Allows you to specify the proxy server used by <ph name="PRODUCT_NAME">$1< ex>Google Chrome</ex></ph> and prevents users from changing proxy settings.
353
354 If you choose to never use a proxy server and always connect directly, all other options are ignored.
319 355
320 If you choose to use system proxy settings or auto detect the proxy server , all other options are ignored. 356 If you choose to use system proxy settings or auto detect the proxy server , all other options are ignored.
321 357
322 If you choose manual proxy settings, you can specify further options in 'A ddress or URL of proxy server', 'URL to a proxy .pac file' and 'Comma-separated list of proxy bypass rules'. 358 If you choose manual proxy settings, you can specify further options in 'A ddress or URL of proxy server', 'URL to a proxy .pac file' and 'Comma-separated list of proxy bypass rules'.
323 359
324 For detailed examples, visit: 360 For detailed examples, visit:
325 <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design- documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph> 361 <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design- documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>
326 362
327 If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</e x></ph> ignores all proxy-related options specified from the command line. 363 If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</e x></ph> ignores all proxy-related options specified from the command line.
328 </message> 364 </message>
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
850 This is the list of policies that <ph name="PRODUCT_NAME">$1<ex>Google Chr ome</ex></ph> respects. 886 This is the list of policies that <ph name="PRODUCT_NAME">$1<ex>Google Chr ome</ex></ph> respects.
851 887
852 You don't need to change these settings by hand! You can download easy-to -use templates from 888 You don't need to change these settings by hand! You can download easy-to -use templates from
853 <ph name="POLICY_TEMPLATE_DOWNLOAD_URL">$5<ex> 889 <ph name="POLICY_TEMPLATE_DOWNLOAD_URL">$5<ex>
854 http://www.chromium.org/administrators/policy-templates</ex></ph>. 890 http://www.chromium.org/administrators/policy-templates</ex></ph>.
855 891
856 The list of supported policies is the same for Chromium and Google Chrome, but their Windows registry locations differ. 892 The list of supported policies is the same for Chromium and Google Chrome, but their Windows registry locations differ.
857 893
858 It starts with <ph name="CHROMIUM_KEY">Software\Policies\Chromium</ph> for Chromium policies and with <ph name="GOOGLE_CHROME_KEY">Software\Policies\Googl e\Chrome</ph> for Google Chrome policies. 894 It starts with <ph name="CHROMIUM_KEY">Software\Policies\Chromium</ph> for Chromium policies and with <ph name="GOOGLE_CHROME_KEY">Software\Policies\Googl e\Chrome</ph> for Google Chrome policies.
859 </message> 895 </message>
860 <message name="IDS_POLICY_DOC_NOTE"
861 desc="Warning notice for policies in the generated policy documenta tion">
862 NOTE: there are some issues about this policy, visit
863 <ph name="POLICY_TEMPLATE_DOWNLOAD_URL">$6<ex>
864 http://www.chromium.org/administrators/policy-list-3/serious-problem</ex ></ph> for more details.
gfeher 2011/01/03 10:30:10 Please don't remove this. There is still code in d
865 </message>
866 <message name="IDS_POLICY_DOC_BACK_TO_TOP" 896 <message name="IDS_POLICY_DOC_BACK_TO_TOP"
867 desc="Text of a link in the generated policy documentation, that ta kes the user to the top of the page"> 897 desc="Text of a link in the generated policy documentation, that ta kes the user to the top of the page">
868 Back to top 898 Back to top
869 </message> 899 </message>
870 <message name="IDS_POLICY_DOC_SUPPORTED" 900 <message name="IDS_POLICY_DOC_SUPPORTED"
871 desc="Appears next to the name of each supported feature in the 'li st of supported policy features' in the generated policy documentation"> 901 desc="Appears next to the name of each supported feature in the 'li st of supported policy features' in the generated policy documentation">
872 Yes 902 Yes
873 </message> 903 </message>
874 <message name="IDS_POLICY_DOC_NOT_SUPPORTED" 904 <message name="IDS_POLICY_DOC_NOT_SUPPORTED"
875 desc="Appears next to the name of each unsupported feature in the ' list of supported policy features' in the generated policy documentation"> 905 desc="Appears next to the name of each unsupported feature in the ' list of supported policy features' in the generated policy documentation">
876 No 906 No
877 </message> 907 </message>
878 <message name="IDS_POLICY_DOC_NAME_COLUMN_TITLE" 908 <message name="IDS_POLICY_DOC_NAME_COLUMN_TITLE"
879 desc="Appears at the top of the policy summary table, over the colu mn of policy names, in the generated policy documentation"> 909 desc="Appears at the top of the policy summary table, over the colu mn of policy names, in the generated policy documentation">
880 Policy Name 910 Policy Name
881 </message> 911 </message>
882 <message name="IDS_POLICY_DOC_DESCRIPTION_COLUMN_TITLE" 912 <message name="IDS_POLICY_DOC_DESCRIPTION_COLUMN_TITLE"
883 desc="Appears at the top of the policy summary table, over the colu mn of short policy descriptions, in the generated policy documentation"> 913 desc="Appears at the top of the policy summary table, over the colu mn of short policy descriptions, in the generated policy documentation">
884 Description 914 Description
885 </message> 915 </message>
886 <message name="IDS_POLICY_DOC_FEATURE_DYNAMIC_REFRESH" 916 <message name="IDS_POLICY_DOC_FEATURE_DYNAMIC_REFRESH"
887 desc="The name of the feature that indicates for a given policy tha t changes to it are respected by Chrome without a browser restart"> 917 desc="The name of the feature that indicates for a given policy tha t changes to it are respected by Chrome without a browser restart">
888 Dynamic Policy Refresh 918 Dynamic Policy Refresh
889 </message> 919 </message>
890 <!-- End of generated documentation messages --> 920 <!-- End of generated documentation messages -->
891 </messages> 921 </messages>
892 </release> 922 </release>
893 </grit> 923 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/policy/policy_templates.json » ('j') | chrome/app/policy/policy_templates.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698