diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 02:17:38 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 02:17:38 +0000 |
| commit | d7e1eb01337e621b6c23e8f3af0d7728a83d78d8 (patch) | |
| tree | decdf30ff9bbabf542c45b40813b79a01a1a33b5 /chrome/app | |
| parent | 2c12398bb295951bf8bbdaae2c7fa9c3e789fe22 (diff) | |
| download | chromium_src-d7e1eb01337e621b6c23e8f3af0d7728a83d78d8.zip chromium_src-d7e1eb01337e621b6c23e8f3af0d7728a83d78d8.tar.gz chromium_src-d7e1eb01337e621b6c23e8f3af0d7728a83d78d8.tar.bz2 | |
Moves instant back into flags.
I'm TBRing this since it's mostly a revert.
TBR=ben@chromium.org
BUG=59298
TEST=make sure instant isn't in preferences anymore.
Review URL: http://codereview.chromium.org/3809005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 91c57ad..ced241f 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4114,12 +4114,6 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_INSTANT_OPT_IN_MESSAGE" desc="Message shown in the instant opt-in dialog"> Instant lets you view web pages and search results faster than ever!\n\nWith 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 search 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 are 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 </message> - <message name="IDS_INSTANT_PREF" desc="Preference for enabling instant"> - Enable Instant for faster searching and browsing - </message> - <message name="IDS_INSTANT_PREF_WARNING" desc="Warning displayed beneath instant pref"> - Omnibox input may be logged - </message> <!-- Click-to-load --> <message name="IDS_PLUGIN_LOAD" desc="The link for loading a blocked plug-in, displayed in the click-to-play UI."> @@ -6442,12 +6436,12 @@ Keep your key file in a safe place. You will need it to create new versions of y <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'"> <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="The title of the default search engine group"> - Search: + Default search: </message> </if> <if expr="pp_ifdef('use_titlecase') and os == 'linux2'"> <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the default search engine group"> - Search + Default Search </message> </if> <message name="IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES_LINK" |