| Index: chrome/app/policy/policy_templates.grd
|
| diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd
|
| index a4d5d973bec1e9f2246b755c895971c1e16dd3e2..4176287c8b7bd13779e1478d4409aaf3c76db969 100644
|
| --- a/chrome/app/policy/policy_templates.grd
|
| +++ b/chrome/app/policy/policy_templates.grd
|
| @@ -10,6 +10,7 @@ templates and will be translated for each locale. -->
|
| <output filename="app/policy/windows/admx/en-US/chrome.adml" type="adml" lang="en" />
|
| <output filename="app/policy/common/html/chrome_policy_list.html" type="doc" lang="en" />
|
| <output filename="app/policy/windows/adm/en-US/chrome.adm" type="adm" lang="en" />
|
| + <output filename="app/policy/linux/chrome.json" type="json" lang="en" />
|
|
|
| <if expr="os == 'darwin'">
|
| <output filename="app/policy/mac/app-Manifest.plist" type="plist" lang="en" />
|
| @@ -177,7 +178,7 @@ templates and will be translated for each locale. -->
|
| </message>
|
| <message name="IDS_POLICY_DISABLESPDY_DESC" desc="Description of the 'Disable SPDY' policy.">
|
| Disables use of the SPDY protocol in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
|
| - </message>
|
| + </message>
|
|
|
| <message name="IDS_POLICY_JAVASCRIPTENABLED_CAPTION" desc="Caption of the 'JavaScript enabled' policy settings page.">
|
| Enable JavaScript
|
|
|