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

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

Issue 5238002: Reintegrate 552 r66225-r66645.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552d/src/
Patch Set: '' Created 10 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
« no previous file with comments | « no previous file | chrome/app/nibs/ContentSettings.xib » ('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 <!-- This file contains definitions of resources that will be translated for 3 <!-- This file contains definitions of resources that will be translated for
4 each locale. --> 4 each locale. -->
5 5
6 <grit base_dir="." latest_public_release="0" current_release="1" 6 <grit base_dir="." latest_public_release="0" current_release="1"
7 source_lang_id="en" enc_check="möl"> 7 source_lang_id="en" enc_check="möl">
8 <outputs> 8 <outputs>
9 <output filename="grit/generated_resources.h" type="rc_header"> 9 <output filename="grit/generated_resources.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 4085 matching lines...) Expand 10 before | Expand all | Expand 10 after
4096 </message> 4096 </message>
4097 <message name="IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION" desc="Descript ion of the 'GPU Accelerated Canvas 2D' lab."> 4097 <message name="IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION" desc="Descript ion of the 'GPU Accelerated Canvas 2D' lab.">
4098 Enables higher performance of canvas tags with a 2D context by rendering using Graphics Processor Unit (GPU) hardware. 4098 Enables higher performance of canvas tags with a 2D context by rendering using Graphics Processor Unit (GPU) hardware.
4099 </message> 4099 </message>
4100 <message name="IDS_FLAGS_WEBGL_NAME" desc="Name of the 'WebGL' lab."> 4100 <message name="IDS_FLAGS_WEBGL_NAME" desc="Name of the 'WebGL' lab.">
4101 WebGL 4101 WebGL
4102 </message> 4102 </message>
4103 <message name="IDS_FLAGS_WEBGL_DESCRIPTION" desc="Description of the 'WebG L' lab."> 4103 <message name="IDS_FLAGS_WEBGL_DESCRIPTION" desc="Description of the 'WebG L' lab.">
4104 Enables canvas elements to use 3D graphics via the WebGL API. 4104 Enables canvas elements to use 3D graphics via the WebGL API.
4105 </message> 4105 </message>
4106 <message name="IDS_FLAGS_CLICK_TO_PLAY_NAME" desc="Name of the 'Click-to-P lay' lab.">
4107 Click-to-Play
4108 </message>
4109 <message name="IDS_FLAGS_CLICK_TO_PLAY_DESCRIPTION" desc="Description of t he 'Click-to-Play' lab.">
4110 Click on a blocked plug-in to run it.
4111 </message>
4106 4112
4107 <!-- Instant --> 4113 <!-- Instant -->
4108 <message name="IDS_INSTANT_OPT_IN_ENABLE" desc="Button shown in the omnibo x dropdown for enabling instant"> 4114 <message name="IDS_INSTANT_OPT_IN_ENABLE" desc="Button shown in the omnibo x dropdown for enabling instant">
4109 Enable... 4115 Enable...
4110 </message> 4116 </message>
4111 <message name="IDS_INSTANT_OPT_IN_NO_THANKS" desc="Button shown in the omn ibox dropdodown for not enabling instant"> 4117 <message name="IDS_INSTANT_OPT_IN_NO_THANKS" desc="Button shown in the omn ibox dropdodown for not enabling instant">
4112 No thanks 4118 No thanks
4113 </message> 4119 </message>
4114 <message name="IDS_INSTANT_OPT_IN_LABEL" desc="Label shown in the omnibox dropdown for enabling instant"> 4120 <message name="IDS_INSTANT_OPT_IN_LABEL" desc="Label shown in the omnibox dropdown for enabling instant">
4115 Enable Instant for faster searching and browsing? 4121 Enable Instant for faster searching and browsing?
(...skipping 6582 matching lines...) Expand 10 before | Expand all | Expand 10 after
10698 10704
10699 </messages> 10705 </messages>
10700 10706
10701 <structures fallback_to_english="true"> 10707 <structures fallback_to_english="true">
10702 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 10708 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
10703 </structure> 10709 </structure>
10704 </structures> 10710 </structures>
10705 10711
10706 </release> 10712 </release>
10707 </grit> 10713 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/nibs/ContentSettings.xib » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698