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

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

Issue 3809005: Moves instant back into flags. (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: Created 10 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/about_flags.cc » ('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 4096 matching lines...) Expand 10 before | Expand all | Expand 10 after
4107 </message> 4107 </message>
4108 <message name="IDS_INSTANT_OPT_IN_LABEL" desc="Label shown in the omnibox dropdown for enabling instant"> 4108 <message name="IDS_INSTANT_OPT_IN_LABEL" desc="Label shown in the omnibox dropdown for enabling instant">
4109 Enable Instant for faster searching and browsing? 4109 Enable Instant for faster searching and browsing?
4110 </message> 4110 </message>
4111 <message name="IDS_INSTANT_OPT_IN_TITLE" desc="Title of the instant opt-in dialog"> 4111 <message name="IDS_INSTANT_OPT_IN_TITLE" desc="Title of the instant opt-in dialog">
4112 Instant 4112 Instant
4113 </message> 4113 </message>
4114 <message name="IDS_INSTANT_OPT_IN_MESSAGE" desc="Message shown in the inst ant opt-in dialog"> 4114 <message name="IDS_INSTANT_OPT_IN_MESSAGE" desc="Message shown in the inst ant opt-in dialog">
4115 Instant lets you view web pages and search results faster than ever!\n\n With Instant enabled, most web pages begin loading as soon as you type a URL in the omnibox, before you hit Enter. In addition, if supported by your default sea rch engine, search results appear instantly as you type queries in the omnibox, and in-line predictions help guide your search.\n\nBecause new search results ar e requested each time you press a key, anything you type into the omnibox may be logged as a search query by your default search engine.\n\n 4115 Instant lets you view web pages and search results faster than ever!\n\n With Instant enabled, most web pages begin loading as soon as you type a URL in the omnibox, before you hit Enter. In addition, if supported by your default sea rch engine, search results appear instantly as you type queries in the omnibox, and in-line predictions help guide your search.\n\nBecause new search results ar e requested each time you press a key, anything you type into the omnibox may be logged as a search query by your default search engine.\n\n
4116 </message> 4116 </message>
4117 <message name="IDS_INSTANT_PREF" desc="Preference for enabling instant">
4118 Enable Instant for faster searching and browsing
4119 </message>
4120 <message name="IDS_INSTANT_PREF_WARNING" desc="Warning displayed beneath i nstant pref">
4121 Omnibox input may be logged
4122 </message>
4123 4117
4124 <!-- Click-to-load --> 4118 <!-- Click-to-load -->
4125 <message name="IDS_PLUGIN_LOAD" desc="The link for loading a blocked plug- in, displayed in the click-to-play UI."> 4119 <message name="IDS_PLUGIN_LOAD" desc="The link for loading a blocked plug- in, displayed in the click-to-play UI.">
4126 Click to run this plug-in 4120 Click to run this plug-in
4127 </message> 4121 </message>
4128 <message name="IDS_PLUGIN_LOAD_SHORT" desc="The link for loading all block ed plug-ins, displayed in the infobar."> 4122 <message name="IDS_PLUGIN_LOAD_SHORT" desc="The link for loading all block ed plug-ins, displayed in the infobar.">
4129 Allow 4123 Allow
4130 </message> 4124 </message>
4131 <message name="IDS_PLUGIN_UPDATE" desc="The link for updating an outdated plug-in."> 4125 <message name="IDS_PLUGIN_UPDATE" desc="The link for updating an outdated plug-in.">
4132 Update plug-in... 4126 Update plug-in...
(...skipping 2302 matching lines...) Expand 10 before | Expand all | Expand 10 after
6435 <message name="IDS_OPTIONS_TOOLBAR_GROUP_NAME" desc="The title of the to olbar group"> 6429 <message name="IDS_OPTIONS_TOOLBAR_GROUP_NAME" desc="The title of the to olbar group">
6436 Toolbar: 6430 Toolbar:
6437 </message> 6431 </message>
6438 <message name="IDS_OPTIONS_PAGE_OPTION_SHOW_BUTTON" desc="The label of t he 'Show Page and Tools menus on toolbar' checkbox"> 6432 <message name="IDS_OPTIONS_PAGE_OPTION_SHOW_BUTTON" desc="The label of t he 'Show Page and Tools menus on toolbar' checkbox">
6439 Show Page and Tools menus 6433 Show Page and Tools menus
6440 </message> 6434 </message>
6441 </if> 6435 </if>
6442 6436
6443 <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'"> 6437 <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'">
6444 <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="The title of the default search engine group"> 6438 <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="The title of the default search engine group">
6445 Search: 6439 Default search:
6446 </message> 6440 </message>
6447 </if> 6441 </if>
6448 <if expr="pp_ifdef('use_titlecase') and os == 'linux2'"> 6442 <if expr="pp_ifdef('use_titlecase') and os == 'linux2'">
6449 <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the default search engine group"> 6443 <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the default search engine group">
6450 Search 6444 Default Search
6451 </message> 6445 </message>
6452 </if> 6446 </if>
6453 <message name="IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES_LINK" 6447 <message name="IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES_LINK"
6454 desc="The label of a link that brings up the keyword editor (aka search engine editor)"> 6448 desc="The label of a link that brings up the keyword editor (aka search engine editor)">
6455 Manage 6449 Manage
6456 </message> 6450 </message>
6457 6451
6458 <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'"> 6452 <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'">
6459 <message name="IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME" desc="The title of the default browser group"> 6453 <message name="IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME" desc="The title of the default browser group">
6460 Default browser: 6454 Default browser:
(...skipping 4182 matching lines...) Expand 10 before | Expand all | Expand 10 after
10643 10637
10644 </messages> 10638 </messages>
10645 10639
10646 <structures fallback_to_english="true"> 10640 <structures fallback_to_english="true">
10647 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 10641 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
10648 </structure> 10642 </structure>
10649 </structures> 10643 </structures>
10650 10644
10651 </release> 10645 </release>
10652 </grit> 10646 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698