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

Unified Diff: chrome/app/generated_resources.grd

Issue 7972013: ConfigurationPolicyPrefStore refactoring to surface error messages. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: . Created 9 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index beefa893b7cd6c985cd3386879506751c48ad0c6..6fd0dba7ff0d5c5797b19e02f296b5269b2c9230 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4290,6 +4290,55 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_POLICY_HIDE" desc="The text for the link that hides overflowing text in a policy value or policy status table cell.">
[Hide]
</message>
+ <message name="IDS_POLICY_TYPE_ERROR" desc="The text displayed in the status column when a policy value has the wrong type.">
+ Expected <ph name="VALUE_TYPE">$1<ex>boolean</ex></ph> value.
+ </message>
+ <message name="IDS_POLICY_OUT_OF_RANGE_ERROR" desc="The text displayed in the status column when a policy value is out of range.">
+ Value is out of range <ph name="VALUE">$1<ex>10</ex></ph>.
+ </message>
+ <message name="IDS_POLICY_PARSE_ERROR" desc="The text displayed in the status column when a policy value could not be parsed.">
+ Value could not be parsed.
+ </message>
+ <message name="IDS_POLICY_DEFAULT_SEARCH_DISABLED" desc="The text displayed in the status column when a policy value has been ignored because default search has been disabled">
Mattias Nissler (ping if slow) 2011/09/26 13:30:48 period
simo 2011/09/29 09:33:08 Done.
+ Ignored because default search is disabled by policy.
+ </message>
+ <message name="IDS_POLICY_NOT_SPECIFIED_ERROR" desc="The text displayed in the status column when a policy value should have been specified but wasn't.">
+ Must be specified.
+ </message>
+ <message name="IDS_POLICY_INVALID_ERROR" desc="The text displayed in the status column when a policy value is invalid.">
+ Invalid value.
+ </message>
+ <message name="IDS_POLICY_NOT_RECOGNIZED_ERROR" desc="The text displayed in the status column when a policy value could not be recognized.">
+ Value isn't recognized.
Mattias Nissler (ping if slow) 2011/09/26 13:30:48 What's the difference between PARSE_ERROR, INVALID
simo 2011/09/29 09:33:08 I've removed NOT_RECOGNIZED and PARSE_ERROR and us
+ </message>
+ <message name="IDS_POLICY_PROXY_MODE_NOT_SPECIFIED_ERROR" desc="The text displayed in the status column when the ProxyMode policy should have been specified but wasn't.">
+ Proxy settings details are defined without setting a proxy mode.
Mattias Nissler (ping if slow) 2011/09/26 13:30:48 Isn't this similar to NOT_SPECIFIED?
simo 2011/09/29 09:33:08 Yes, true.
+ </message>
+ <message name="IDS_POLICY_PROXY_MODE_DISABLED_ERROR" desc="The text displayed in the status column when use of a proxy is disabled but a proxy configuration is given.">
+ Use of a proxy is disabled but an explicit proxy configuration is specified.
+ </message>
+ <message name="IDS_POLICY_PROXY_MODE_AUTO_DETECT_ERROR" desc="The text displayed in the status column when the proxy is set to auto configured but a proxy configuration is given.">
+ Proxy is set to auto configured.
+ </message>
+ <message name="IDS_POLICY_PROXY_MODE_PAC_URL_ERROR" desc="The text displayed in the status column when the proxy configuration is set to use a .pac script URL but policies only for fixed proxy servers are also specified.">
+ Proxy configuration is set to use a .pac script URL, not fixed proxy servers.
+ </message>
+ <message name="IDS_POLICY_PROXY_MODE_FIXED_SERVERS_ERROR" desc="The text displayed in the status column when the proxy configuration is set to use fixed proxy servers but an alternate configuration is given.">
+ Proxy is set to use fixed proxy servers, not a .pac script URL.
+ </message>
+ <message name="IDS_POLICY_PROXY_MODE_SYSTEM_ERROR" desc="The text displayed in the status column when the proxy configuration is set to use system settings but an alternate configuration is given.">
+ System proxy settings are set to be used but an explicit proxy configuration is also specified.
+ </message>
+ <message name="IDS_POLICY_PROXY_BOTH_SPECIFIED_ERROR" desc="The text displayed in the status column when both fixed proxy servers and .pac url are specified.">
+ Both fixed proxy servers and a .pac script URL are specified.
+ </message>
+ <message name="IDS_POLICY_PROXY_NEITHER_SPECIFIED_ERROR" desc="The text displayed in the status column when neither a fixed proxy servers or a .pac url are specified.">
+ Neither fixed proxy servers nor a .pac script URL are specified.
+ </message>
+ <message name="IDS_POLICY_PROXY_MODE_IGNORED" desc="The text displayed in the status column when a policy value has been ignored because the ProxyServerMode policy is defined.">
+ Ignored because ProxyServerMode is also defined.
Mattias Nissler (ping if slow) 2011/09/26 13:30:48 It seems like many of these messages are "X is ign
simo 2011/09/29 09:33:08 Yes, there are two messages of this form but in on
+ </message>
+
<!-- about:flags -->
<message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for the about:flags page.">
Careful, these experiments may bite
« no previous file with comments | « no previous file | chrome/browser/policy/browser_policy_connector.h » ('j') | chrome/browser/policy/configuration_policy_handler.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698