summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 03:25:50 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 03:25:50 +0000
commit205137b36e97ae29017a1d813cf95f7f58b35171 (patch)
treefd3a74e7b869c1466d48acdf93695dcb1c3f238c /chrome/app
parent29195fc544c2c18fc6142cadae4898a604b8775a (diff)
downloadchromium_src-205137b36e97ae29017a1d813cf95f7f58b35171.zip
chromium_src-205137b36e97ae29017a1d813cf95f7f58b35171.tar.gz
chromium_src-205137b36e97ae29017a1d813cf95f7f58b35171.tar.bz2
Tweaks to instant opt-in dialog.
BUG=60646 TEST=none TBR=ben@chromium.org Review URL: http://codereview.chromium.org/5262009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chromium_strings.grd3
-rw-r--r--chrome/app/generated_resources.grd5
-rw-r--r--chrome/app/google_chrome_strings.grd3
-rw-r--r--chrome/app/resources/locale_settings.grd2
4 files changed, 8 insertions, 5 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index c622a61..01c54cf 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -155,6 +155,9 @@ be available for now. -->
About Chromium Frame...
</message>
</if>
+ <message name="IDS_INSTANT_OPT_IN_TITLE" desc="Title of the instant opt-in dialog">
+ Instant
+ </message>
<message name="IDS_CERT_ERROR_COMMON_NAME_INVALID_EXTRA_INFO_2" desc="2nd paragraph of extra information for an unsafe common name in an X509 certificate">
In this case, the address listed in the certificate does not match the address of the website your browser tried to go to. One possible reason for this is that your communications are being intercepted by an attacker who is presenting a certificate for a different website, which would cause a mismatch. Another possible reason is that the server is set up to return the same certificate for multiple websites, including the one you are attempting to visit, even though that certificate is not valid for all of those websites. Chromium can say for sure that you reached &lt;strong&gt;<ph name="DOMAIN2">$1<ex>paypal.com</ex></ph>&lt;/strong&gt;, but cannot verify that that is the same site as &lt;strong&gt;<ph name="DOMAIN">$2<ex>www.paypal.com</ex></ph>&lt;/strong&gt; which you intended to reach. If you proceed, Chromium will not check for any further name mismatches. In general, it is best not to proceed past this point.
</message>
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e61f3ec..6732f1b 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4193,11 +4193,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_INSTANT_OPT_IN_LABEL" desc="Label shown in the omnibox dropdown for enabling instant">
Enable Instant for faster searching and browsing?
</message>
- <message name="IDS_INSTANT_OPT_IN_TITLE" desc="Title of the instant opt-in dialog">
- Instant
- </message>
<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
+ 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 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
</message>
<message name="IDS_INSTANT_PREF" desc="Preference for enabling instant">
Enable Instant for faster searching and browsing
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 21545cd4..336efe4 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -206,6 +206,9 @@ Chrome supports. -->
About Chrome Frame...
</message>
</if>
+ <message name="IDS_INSTANT_OPT_IN_TITLE" desc="Title of the instant opt-in dialog">
+ Google Chrome Instant
+ </message>
<message name="IDS_CERT_ERROR_COMMON_NAME_INVALID_EXTRA_INFO_2" desc="2nd paragraph of extra information for an unsafe common name in an X509 certificate">
In this case, the address listed in the certificate does not match the address of the website your browser tried to go to. One possible reason for this is that your communications are being intercepted by an attacker who is presenting a certificate for a different website, which would cause a mismatch. Another possible reason is that the server is set up to return the same certificate for multiple websites, including the one you are attempting to visit, even though that certificate is not valid for all of those websites. Google Chrome can say for sure that you reached &lt;strong&gt;<ph name="DOMAIN2">$1<ex>paypal.com</ex></ph>&lt;/strong&gt;, but cannot verify that that is the same site as &lt;strong&gt;<ph name="DOMAIN">$2<ex>www.paypal.com</ex></ph>&lt;/strong&gt; which you intended to reach. If you proceed, Chrome will not check for any further name mismatches. In general, it is best not to proceed past this point.
</message>
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 9f79066..ac835de 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -698,7 +698,7 @@
<!-- The width of the Instant confirm dialog box in characters. -->
<message name="IDS_INSTANT_CONFIRM_DIALOG_WIDTH_CHARS" use_name_for_id="true">
- 95
+ 70
</message>
<if expr="pp_ifdef('chromeos')">