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

Side by Side Diff: chrome/app/generated_resources.grd

Issue 8139029: Make policy errors available to display in about:policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unused replacement string DCHECK from policy_error_map.cc 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
« no previous file with comments | « no previous file | chrome/browser/policy/browser_policy_connector.h » ('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 <!-- 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 4366 matching lines...) Expand 10 before | Expand all | Expand 10 after
4377 </message> 4377 </message>
4378 <message name="IDS_POLICY_STATUS_LOCAL_ERROR" desc="Indicates that a polic y fetch failed due to a local error."> 4378 <message name="IDS_POLICY_STATUS_LOCAL_ERROR" desc="Indicates that a polic y fetch failed due to a local error.">
4379 Local error 4379 Local error
4380 </message> 4380 </message>
4381 <message name="IDS_POLICY_STATUS_SIGNATURE_ERROR" desc="Indicates that a p olicy fetch failed because a signature verification failed."> 4381 <message name="IDS_POLICY_STATUS_SIGNATURE_ERROR" desc="Indicates that a p olicy fetch failed because a signature verification failed.">
4382 Signature mismatch 4382 Signature mismatch
4383 </message> 4383 </message>
4384 <message name="IDS_POLICY_STATUS_SERIAL_ERROR" desc="Indicates that a poli cy fetch failed because the serial number was invalid."> 4384 <message name="IDS_POLICY_STATUS_SERIAL_ERROR" desc="Indicates that a poli cy fetch failed because the serial number was invalid.">
4385 Invalid serial number 4385 Invalid serial number
4386 </message> 4386 </message>
4387 <message name="IDS_POLICY_TYPE_ERROR" desc="The text displayed in the stat us column when a policy value has the wrong type.">
4388 Expected <ph name="VALUE_TYPE">$1<ex>boolean</ex></ph> value.
4389 </message>
4390 <message name="IDS_POLICY_OUT_OF_RANGE_ERROR" desc="The text displayed in the status column when a policy value is out of range.">
4391 Value is out of range <ph name="VALUE">$1<ex>10</ex></ph>.
4392 </message>
4393 <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.">
4394 Ignored because default search is disabled by policy.
4395 </message>
4396 <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.">
4397 Must be specified.
4398 </message>
4399 <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.">
4400 Invalid search URL.
4401 </message>
4402 <message name="IDS_POLICY_INVALID_PROXY_MODE_ERROR" desc="The text display ed in the status column when the value for ProxyMode is invalid.">
4403 Invalid proxy mode.
4404 </message>
4405 <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.">
4406 Use of a proxy is disabled but an explicit proxy configuration is specif ied.
4407 </message>
4408 <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.">
4409 Proxy is set to auto configured.
4410 </message>
4411 <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.">
4412 Proxy configuration is set to use a .pac script URL, not fixed proxy ser vers.
4413 </message>
4414 <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.">
4415 Proxy is set to use fixed proxy servers, not a .pac script URL.
4416 </message>
4417 <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.">
4418 System proxy settings are set to be used but an explicit proxy configura tion is also specified.
4419 </message>
4420 <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.">
4421 Both fixed proxy servers and a .pac script URL are specified.
4422 </message>
4423 <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.">
4424 Neither fixed proxy servers nor a .pac script URL are specified.
4425 </message>
4426 <message name="IDS_POLICY_OVERRIDDEN" desc="The text displayed in the stat us column when the corresponding policy is being ignored because another policy is overriding it.">
4427 Ignored because it was overridden by <ph name="POLICY_NAME">$1<ex>ProxyM ode</ex></ph>.
4428 </message>
4429
4387 <!-- about:flags --> 4430 <!-- about:flags -->
4388 <message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for t he about:flags page."> 4431 <message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for t he about:flags page.">
4389 Careful, these experiments may bite 4432 Careful, these experiments may bite
4390 </message> 4433 </message>
4391 <message name="IDS_FLAGS_TABLE_TITLE" desc="Title for the experiments tabl e on the about:flags page."> 4434 <message name="IDS_FLAGS_TABLE_TITLE" desc="Title for the experiments tabl e on the about:flags page.">
4392 Experiments 4435 Experiments
4393 </message> 4436 </message>
4394 <message name="IDS_FLAGS_WARNING_HEADER" desc="Text right before the warni ng body text."> 4437 <message name="IDS_FLAGS_WARNING_HEADER" desc="Text right before the warni ng body text.">
4395 WARNING 4438 WARNING
4396 </message> 4439 </message>
(...skipping 10084 matching lines...) Expand 10 before | Expand all | Expand 10 after
14481 </messages> 14524 </messages>
14482 <structures fallback_to_english="true"> 14525 <structures fallback_to_english="true">
14483 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14526 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14484 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14527 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14485 </structure> 14528 </structure>
14486 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14529 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14487 </structure> 14530 </structure>
14488 </structures> 14531 </structures>
14489 </release> 14532 </release>
14490 </grit> 14533 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/browser_policy_connector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698