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

Unified Diff: chrome/app/generated_resources.grd

Issue 18153007: Add policies to control power management on the Chrome OS login screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Correct example in policy_templates.json. Created 7 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:
Download patch
« no previous file with comments | « no previous file | chrome/app/policy/policy_templates.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e8aca6c3ae7c163b24242b65cd051751c33e1156..8b5b6ee20511dc79b4cf5ab5db66e602bae8cb19 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6120,6 +6120,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_POLICY_NETWORK_CONFIG_IMPORT_FAILED" desc="The text displayed in the status column when the corresponding network configuration policy is invalid.">
The network configuration is invalid and couldn't be imported.
</message>
+ <message name="IDS_POLICY_JSON_PARSE_ERROR" desc="The text displayed in the status column when a policy that should have been specified in JSON format could not be parsed.">
+ Failed to parse JSON format: <ph name="JSON_PARSE_ERROR">$1<ex>Unexpected token.</ex></ph>
+ </message>
<message name="IDS_POLICY_OK" desc="Text displayed in the status column when a valid value is set for a policy.">
OK
</message>
« 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