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

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

Issue 6021010: Fix setting a proxy configuration via policy that specifies a .pac file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address feedback and fix tests Created 9 years, 12 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
« no previous file with comments | « no previous file | chrome/app/policy/policy_templates.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 839 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. 850 This is the list of policies that <ph name="PRODUCT_NAME">$1<ex>Google Chr ome</ex></ph> respects.
851 851
852 You don't need to change these settings by hand! You can download easy-to -use templates from 852 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> 853 <ph name="POLICY_TEMPLATE_DOWNLOAD_URL">$5<ex>
854 http://www.chromium.org/administrators/policy-templates</ex></ph>. 854 http://www.chromium.org/administrators/policy-templates</ex></ph>.
855 855
856 The list of supported policies is the same for Chromium and Google Chrome, but their Windows registry locations differ. 856 The list of supported policies is the same for Chromium and Google Chrome, but their Windows registry locations differ.
857 857
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. 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.
859 </message> 859 </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.
865 </message>
866 <message name="IDS_POLICY_DOC_BACK_TO_TOP" 860 <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"> 861 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 862 Back to top
869 </message> 863 </message>
870 <message name="IDS_POLICY_DOC_SUPPORTED" 864 <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"> 865 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 866 Yes
873 </message> 867 </message>
874 <message name="IDS_POLICY_DOC_NOT_SUPPORTED" 868 <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"> 869 desc="Appears next to the name of each unsupported feature in the ' list of supported policy features' in the generated policy documentation">
876 No 870 No
877 </message> 871 </message>
878 <message name="IDS_POLICY_DOC_NAME_COLUMN_TITLE" 872 <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"> 873 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 874 Policy Name
881 </message> 875 </message>
882 <message name="IDS_POLICY_DOC_DESCRIPTION_COLUMN_TITLE" 876 <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"> 877 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 878 Description
885 </message> 879 </message>
886 <message name="IDS_POLICY_DOC_FEATURE_DYNAMIC_REFRESH" 880 <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"> 881 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 882 Dynamic Policy Refresh
889 </message> 883 </message>
890 <!-- End of generated documentation messages --> 884 <!-- End of generated documentation messages -->
891 </messages> 885 </messages>
892 </release> 886 </release>
893 </grit> 887 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/policy/policy_templates.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698