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

Side by Side 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, 2 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 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 4272 matching lines...) Expand 10 before | Expand all | Expand 10 after
4283 </message> 4283 </message>
4284 <message name="IDS_POLICY_ENTRY_STATUS" desc="The table header for the col umn in policy table that contains the status of the policy."> 4284 <message name="IDS_POLICY_ENTRY_STATUS" desc="The table header for the col umn in policy table that contains the status of the policy.">
4285 Status 4285 Status
4286 </message> 4286 </message>
4287 <message name="IDS_POLICY_SHOW_MORE" desc="The text for the link that expa nds a policy value or policy status table cell."> 4287 <message name="IDS_POLICY_SHOW_MORE" desc="The text for the link that expa nds a policy value or policy status table cell.">
4288 [Show more] 4288 [Show more]
4289 </message> 4289 </message>
4290 <message name="IDS_POLICY_HIDE" desc="The text for the link that hides ove rflowing text in a policy value or policy status table cell."> 4290 <message name="IDS_POLICY_HIDE" desc="The text for the link that hides ove rflowing text in a policy value or policy status table cell.">
4291 [Hide] 4291 [Hide]
4292 </message> 4292 </message>
4293 <message name="IDS_POLICY_TYPE_ERROR" desc="The text displayed in the stat us column when a policy value has the wrong type.">
4294 Expected <ph name="VALUE_TYPE">$1<ex>boolean</ex></ph> value.
4295 </message>
4296 <message name="IDS_POLICY_OUT_OF_RANGE_ERROR" desc="The text displayed in the status column when a policy value is out of range.">
Mattias Nissler (ping if slow) 2011/09/30 09:01:33 I guess we'll also want to communicate the actual
simo 2011/09/30 13:00:41 Ok.
4297 Value is out of range <ph name="VALUE">$1<ex>10</ex></ph>.
4298 </message>
4299 <message name="IDS_POLICY_DEFAULT_SEARCH_DISABLED" desc="The text displayed in the status column when a policy value has been ignored because default searc h has been disabled.">
4300 Ignored because default search is disabled by policy.
4301 </message>
4302 <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.">
4303 Must be specified.
4304 </message>
4305 <message name="IDS_POLICY_INVALID_SEARCH_URL_ERROR" desc="The text display ed in the status column when a the URL given for DefaultSearchProviderSearchURL is invalid.">
4306 Invalid search URL.
4307 </message>
4308 <message name="IDS_POLICY_INVALID_PROXY_MODE_ERROR" desc="The text display ed in the status column when the value for ProxyMode is invalid.">
4309 Invalid proxy mode.
4310 </message>
4311 <message name="IDS_POLICY_PROXY_MODE_DISABLED_ERROR" desc="The text displa yed in the status column when use of a proxy is disabled but a proxy configurati on is given.">
4312 Use of a proxy is disabled but an explicit proxy configuration is specif ied.
4313 </message>
4314 <message name="IDS_POLICY_PROXY_MODE_AUTO_DETECT_ERROR" desc="The text dis played in the status column when the proxy is set to auto configured but a proxy configuration is given.">
4315 Proxy is set to auto configured.
4316 </message>
4317 <message name="IDS_POLICY_PROXY_MODE_PAC_URL_ERROR" desc="The text display ed 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.">
4318 Proxy configuration is set to use a .pac script URL, not fixed proxy ser vers.
4319 </message>
4320 <message name="IDS_POLICY_PROXY_MODE_FIXED_SERVERS_ERROR" desc="The text d isplayed in the status column when the proxy configuration is set to use fixed p roxy servers but an alternate configuration is given.">
4321 Proxy is set to use fixed proxy servers, not a .pac script URL.
4322 </message>
4323 <message name="IDS_POLICY_PROXY_MODE_SYSTEM_ERROR" desc="The text displaye d in the status column when the proxy configuration is set to use system setting s but an alternate configuration is given.">
4324 System proxy settings are set to be used but an explicit proxy configura tion is also specified.
4325 </message>
4326 <message name="IDS_POLICY_PROXY_BOTH_SPECIFIED_ERROR" desc="The text displ ayed in the status column when both fixed proxy servers and .pac url are specifi ed.">
4327 Both fixed proxy servers and a .pac script URL are specified.
4328 </message>
4329 <message name="IDS_POLICY_PROXY_NEITHER_SPECIFIED_ERROR" desc="The text di splayed in the status column when neither a fixed proxy servers or a .pac url ar e specified.">
4330 Neither fixed proxy servers nor a .pac script URL are specified.
4331 </message>
4332 <message name="IDS_POLICY_PROXY_MODE_IGNORED" desc="The text displayed in the status column when a policy value has been ignored because the ProxyServerMo de policy is defined.">
4333 Ignored because ProxyServerMode is also defined.
4334 </message>
4335
4293 <!-- about:flags --> 4336 <!-- about:flags -->
4294 <message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for t he about:flags page."> 4337 <message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for t he about:flags page.">
4295 Careful, these experiments may bite 4338 Careful, these experiments may bite
4296 </message> 4339 </message>
4297 <message name="IDS_FLAGS_TABLE_TITLE" desc="Title for the experiments tabl e on the about:flags page."> 4340 <message name="IDS_FLAGS_TABLE_TITLE" desc="Title for the experiments tabl e on the about:flags page.">
4298 Experiments 4341 Experiments
4299 </message> 4342 </message>
4300 <message name="IDS_FLAGS_WARNING_HEADER" desc="Text right before the warni ng body text."> 4343 <message name="IDS_FLAGS_WARNING_HEADER" desc="Text right before the warni ng body text.">
4301 WARNING 4344 WARNING
4302 </message> 4345 </message>
(...skipping 9509 matching lines...) Expand 10 before | Expand all | Expand 10 after
13812 </messages> 13855 </messages>
13813 <structures fallback_to_english="true"> 13856 <structures fallback_to_english="true">
13814 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 13857 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
13815 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 13858 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
13816 </structure> 13859 </structure>
13817 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 13860 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
13818 </structure> 13861 </structure>
13819 </structures> 13862 </structures>
13820 </release> 13863 </release>
13821 </grit> 13864 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/browser_policy_connector.h » ('j') | chrome/browser/policy/browser_policy_connector.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698