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

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

Issue 8480003: Surface error messages from ONC parsing in about:policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments, break out code gen / unit test changes. Created 9 years, 1 month 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 4441 matching lines...) Expand 10 before | Expand all | Expand 10 after
4452 </message> 4452 </message>
4453 <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."> 4453 <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.">
4454 Neither fixed proxy servers nor a .pac script URL are specified. 4454 Neither fixed proxy servers nor a .pac script URL are specified.
4455 </message> 4455 </message>
4456 <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."> 4456 <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.">
4457 Ignored because it was overridden by <ph name="POLICY_NAME">$1<ex>ProxyM ode</ex></ph>. 4457 Ignored because it was overridden by <ph name="POLICY_NAME">$1<ex>ProxyM ode</ex></ph>.
4458 </message> 4458 </message>
4459 <message name="IDS_POLICY_DEPRECATED" desc="The text displayed in the stat us column when the corresponding policy is deprecated."> 4459 <message name="IDS_POLICY_DEPRECATED" desc="The text displayed in the stat us column when the corresponding policy is deprecated.">
4460 This policy has been deprecated. 4460 This policy has been deprecated.
4461 </message> 4461 </message>
4462 <message name="IDS_POLICY_NETWORK_CONFIG_PARSE_ERROR" desc="The text displ ayed in the status column when the corresponding network configuration policy fa iled to parse.">
4463 Network configuration failed to be parsed: <ph name="PARSE_ERROR_MESSAGE ">$1<ex>Line: 1, column: 1, Root value must be an array or object.</ex></ph>
Joao da Silva 2011/11/07 13:20:45 The string might be translated, but $1 won't. I do
Mattias Nissler (ping if slow) 2011/11/11 14:57:02 Yes, I know. Hard to fix though, so I thought it's
4464 </message>
4462 4465
4463 <!-- about:flags --> 4466 <!-- about:flags -->
4464 <message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for t he about:flags page."> 4467 <message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for t he about:flags page.">
4465 Careful, these experiments may bite 4468 Careful, these experiments may bite
4466 </message> 4469 </message>
4467 <message name="IDS_FLAGS_TABLE_TITLE" desc="Title for the experiments tabl e on the about:flags page."> 4470 <message name="IDS_FLAGS_TABLE_TITLE" desc="Title for the experiments tabl e on the about:flags page.">
4468 Experiments 4471 Experiments
4469 </message> 4472 </message>
4470 <message name="IDS_FLAGS_WARNING_HEADER" desc="Text right before the warni ng body text."> 4473 <message name="IDS_FLAGS_WARNING_HEADER" desc="Text right before the warni ng body text.">
4471 WARNING 4474 WARNING
(...skipping 10124 matching lines...) Expand 10 before | Expand all | Expand 10 after
14596 </messages> 14599 </messages>
14597 <structures fallback_to_english="true"> 14600 <structures fallback_to_english="true">
14598 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14601 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14599 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14602 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14600 </structure> 14603 </structure>
14601 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14604 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14602 </structure> 14605 </structure>
14603 </structures> 14606 </structures>
14604 </release> 14607 </release>
14605 </grit> 14608 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/onc_network_parser.h » ('j') | chrome/browser/chromeos/cros/onc_network_parser.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698