| OLD | NEW |
| 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 4438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4449 </message> | 4449 </message> |
| 4450 <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."> | 4450 <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."> |
| 4451 Both fixed proxy servers and a .pac script URL are specified. | 4451 Both fixed proxy servers and a .pac script URL are specified. |
| 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_NETWORK_CONFIG_PARSE_ERROR" desc="The text displ
ayed in the status column when the corresponding network configuration policy fa
iled to parse."> |
| 4460 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> |
| 4461 </message> |
| 4459 | 4462 |
| 4460 <!-- about:flags --> | 4463 <!-- about:flags --> |
| 4461 <message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for t
he about:flags page."> | 4464 <message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for t
he about:flags page."> |
| 4462 Careful, these experiments may bite | 4465 Careful, these experiments may bite |
| 4463 </message> | 4466 </message> |
| 4464 <message name="IDS_FLAGS_TABLE_TITLE" desc="Title for the experiments tabl
e on the about:flags page."> | 4467 <message name="IDS_FLAGS_TABLE_TITLE" desc="Title for the experiments tabl
e on the about:flags page."> |
| 4465 Experiments | 4468 Experiments |
| 4466 </message> | 4469 </message> |
| 4467 <message name="IDS_FLAGS_WARNING_HEADER" desc="Text right before the warni
ng body text."> | 4470 <message name="IDS_FLAGS_WARNING_HEADER" desc="Text right before the warni
ng body text."> |
| 4468 WARNING | 4471 WARNING |
| (...skipping 10124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 14593 </messages> | 14596 </messages> |
| 14594 <structures fallback_to_english="true"> | 14597 <structures fallback_to_english="true"> |
| 14595 <!-- Make sure these stay in sync with the structures in generated_resourc
es.grd. --> | 14598 <!-- Make sure these stay in sync with the structures in generated_resourc
es.grd. --> |
| 14596 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type
="dialog" > | 14599 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type
="dialog" > |
| 14597 </structure> | 14600 </structure> |
| 14598 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ
e="dialog" > | 14601 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ
e="dialog" > |
| 14599 </structure> | 14602 </structure> |
| 14600 </structures> | 14603 </structures> |
| 14601 </release> | 14604 </release> |
| 14602 </grit> | 14605 </grit> |
| OLD | NEW |