summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/chromium_strings.grd4
-rw-r--r--chrome/app/generated_resources.grd4
-rw-r--r--chrome/app/google_chrome_strings.grd4
-rw-r--r--chrome/browser/dom_ui/options/advanced_options_handler.cc6
-rw-r--r--chrome/browser/resources/options/advanced_options.css5
-rw-r--r--chrome/browser/resources/options/advanced_options.html11
6 files changed, 24 insertions, 10 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 8e85f33..c30ea42 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -398,9 +398,13 @@ be available for now. -->
Chromium installation directory seems to be in use. Please reboot your computer and try again.
</message>
<!-- Options Dialog -->
+ <!--TODO(kmadhusu): Remove "IDS_OPTIONS_DISABLE_SERVICES" after platform-specific dialogs are removed.-->
<message name="IDS_OPTIONS_DISABLE_SERVICES" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
Chromium may use web services to improve your browsing experience. You may optionally disable these services.
</message>
+ <message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
+ Chromium may use web services to improve your browsing experience.
+ </message>
<message name="IDS_IMPORT_BOOKMARKS" desc="Explanatory text for the importing progress dialog when importing a bookmarks.html file from the bookmark manager">
Chromium is now importing Favorites/Bookmarks.
</message>
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index ebc4802..73d4103 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7956,7 +7956,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON" desc="Text for clear browsing data dialog in Privacy options">
Clear browsing data...
</message>
-
+ <message name="IDS_OPTIONS_DISABLE_WEB_SERVICES" desc="The text in the options panel describes that we can disable web services.">
+ You may optionally disable these services.
+ </message>
<message name="IDS_OPTIONS_LINKDOCTOR_PREF" desc="The documentation string of the 'Use Link Doctor' preference">
Show suggestions for navigation errors.
</message>
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 4d100d2..3d21f5f 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -444,9 +444,13 @@ Chrome supports. -->
Google Chrome installation directory seems to be in use. Please reboot your computer and try again.
</message>
<!-- Options Dialog -->
+ <!-- TODO(kmadhusu): Remove "IDS_OPTIONS_DISABLE_SERVICES" after platform-specific dialogs are removed.-->
<message name="IDS_OPTIONS_DISABLE_SERVICES" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
Google Chrome may use web services to improve your browsing experience. You may optionally disable these services.
</message>
+ <message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
+ Google Chrome may use web services to improve your browsing experience.
+ </message>
<message name="IDS_IMPORT_BOOKMARKS" desc="Explanatory text for the importing progress dialog when importing a bookmarks.html file from the bookmark manager">
Google Chrome is now importing Favorites/Bookmarks.
</message>
diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc
index d224389..5243c54 100644
--- a/chrome/browser/dom_ui/options/advanced_options_handler.cc
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc
@@ -169,8 +169,10 @@ void AdvancedOptionsHandler::GetLocalizedValues(
#endif
localized_strings->SetString("enableLogging",
l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_LOGGING));
- localized_strings->SetString("disableServices",
- l10n_util::GetStringUTF16(IDS_OPTIONS_DISABLE_SERVICES));
+ localized_strings->SetString("improveBrowsingExperience",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE));
+ localized_strings->SetString("disableWebServices",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_DISABLE_WEB_SERVICES));
localized_strings->SetString("optionsReset",
l10n_util::GetStringUTF16(IDS_OPTIONS_RESET));
localized_strings->SetString("optionsResetMessage",
diff --git a/chrome/browser/resources/options/advanced_options.css b/chrome/browser/resources/options/advanced_options.css
index 2193a33..b897168 100644
--- a/chrome/browser/resources/options/advanced_options.css
+++ b/chrome/browser/resources/options/advanced_options.css
@@ -4,9 +4,6 @@
* found in the LICENSE file.
*/
-.disable-services-div {
- color: grey;
-}
-.disable-services-span {
+.informational-text {
color: grey;
}
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index 309d1b4..a1c8858 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -9,9 +9,14 @@
<button id="privacyClearDataButton"
i18n-content="privacyClearDataButton"></button>
</div>
- <div i18n-content="disableServices" class="disable-services-div"></div>
- <div><a target="_blank" i18n-content="learnMore"
- i18n-values="href:privacyLearnMoreURL"></a></div>
+ <div i18n-content="improveBrowsingExperience" class="informational-text">
+ </div>
+ <div>
+ <span i18n-content="disableWebServices" class="informational-text">
+ </span>
+ <a target="_blank" i18n-content="learnMore"
+ i18n-values="href:privacyLearnMoreURL"></a>
+ </div>
<label class="checkbox">
<input id="alternateErrorPagesEnabled" pref="alternate_error_pages.enabled"
metric="Options_LinkDoctorCheckbox" type="checkbox">