[Site settings] Update intrusive ads strings
The old Skia Gold Pixeltest images will be invalidated in a follow-up CL.
Screenshots: crbug.com/1378703#c290, crbug.com/1378703#c292
Bug: 1378703
Change-Id: Iacf9c40721e04932eaf3eed9dee3cac2d28570ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4150491
Commit-Queue: Olesia Marukhno <olesiamarukhno@google.com>
Auto-Submit: Rainhard Findling <rainhard@chromium.org>
Reviewed-by: Olesia Marukhno <olesiamarukhno@google.com>
Cr-Commit-Position: refs/heads/main@{#1091326}
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
index f0d22fd6..d6250a60 100644
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -2867,11 +2867,11 @@
<message name="IDS_SETTINGS_SITE_SETTINGS_ADS_DESCRIPTION" desc="Description of the ads content setting. In order to comply with the ND4C regulations the translations for this message should use one of the legally approved terms as an alternative to 'free'.">
Sites usually show ads so they can provide content or services free of charge. But, some sites are known to show intrusive or misleading ads.
</message>
- <message name="IDS_SETTINGS_SITE_SETTINGS_ADS_ALLOWED" desc="Label for the enabled option of the ads content setting.">
- All sites can show any ads to you
+ <message name="IDS_SETTINGS_SITE_SETTINGS_ADS_ALLOWED" desc="1 of 2 states for the 'Intrusive ads' setting.">
+ Any site you visit can show any ad to you
</message>
- <message name="IDS_SETTINGS_SITE_SETTINGS_ADS_BLOCKED" desc="Label for the disabled option of the ads content setting.">
- Block ads on sites that show intrusive or misleading ads
+ <message name="IDS_SETTINGS_SITE_SETTINGS_ADS_BLOCKED" desc="2 of 2 states for the 'intrusive ads' setting.">
+ Ads are blocked on sites known to show intrusive or misleading ads
</message>
<message name="IDS_SETTINGS_SITE_SETTINGS_ADS_ALLOWED_EXCEPTIONS" desc="Label for the allowed exceptions site list of the ads content setting.">
Allowed to show any ads
diff --git a/chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_ADS_ALLOWED.png.sha1 b/chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_ADS_ALLOWED.png.sha1
index f6836a1..b40ee10 100644
--- a/chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_ADS_ALLOWED.png.sha1
+++ b/chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_ADS_ALLOWED.png.sha1
@@ -1 +1 @@
-af33578dd4141ae5fb23545465977d9412b591be
\ No newline at end of file
+c75d072a2240a93d6bf88ac0b77244f067818ef8
\ No newline at end of file
diff --git a/chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_ADS_BLOCKED.png.sha1 b/chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_ADS_BLOCKED.png.sha1
index 9733942..fca3d62 100644
--- a/chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_ADS_BLOCKED.png.sha1
+++ b/chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_ADS_BLOCKED.png.sha1
@@ -1 +1 @@
-2b5ee4ad601d17098b8dd80ed60c9f10c2cb12d6
\ No newline at end of file
+2637c3d591c4e8246bd126a1764163881f26222f
\ No newline at end of file
diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view_dialog_browsertest.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view_dialog_browsertest.cc
index bfbbd1ec..cddab7e 100644
--- a/chrome/browser/ui/views/page_info/page_info_bubble_view_dialog_browsertest.cc
+++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_dialog_browsertest.cc
@@ -408,6 +408,8 @@
// set. All permissions will show regardless of its factory default value.
IN_PROC_BROWSER_TEST_F(PageInfoBubbleViewDialogBrowserTest,
InvokeUi_AllowAllPermissions) {
+ // Last updated in crrev.com/c/4150491.
+ set_baseline("4150491");
ShowAndVerifyUi();
}
@@ -415,6 +417,8 @@
// set. All permissions will show regardless of its factory default value.
IN_PROC_BROWSER_TEST_F(PageInfoBubbleViewDialogBrowserTest,
InvokeUi_BlockAllPermissions) {
+ // Last updated in crrev.com/c/4150491.
+ set_baseline("4150491");
ShowAndVerifyUi();
}
diff --git a/components/site_settings_strings.grdp b/components/site_settings_strings.grdp
index 0b7322e..d2dd165 100644
--- a/components/site_settings_strings.grdp
+++ b/components/site_settings_strings.grdp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<grit-part>
<!-- Site Settings common -->
- <message name="IDS_SITE_SETTINGS_TYPE_ADS" desc="The label used for the ads site settings controls.">
- Ads
+ <message name="IDS_SITE_SETTINGS_TYPE_ADS" desc="This string is the name of the intrusive ads setting (visit chrome://settings/content and click 'Additional content settings').">
+ Intrusive ads
</message>
- <message name="IDS_SITE_SETTINGS_TYPE_ADS_MID_SENTENCE" desc="The label used for the ads site settings controls when used mid-sentence.">
- ads
+ <message name="IDS_SITE_SETTINGS_TYPE_ADS_MID_SENTENCE" desc="This string is the name of the intrusive ads setting (visit chrome://settings/content and click 'Additional content settings') when used mid-sentence.">
+ intrusive ads
</message>
<message name="IDS_SITE_SETTINGS_TYPE_AR" desc="The label used for the AR site settings controls.">
Augmented reality
diff --git a/components/site_settings_strings_grdp/IDS_SITE_SETTINGS_TYPE_ADS.png.sha1 b/components/site_settings_strings_grdp/IDS_SITE_SETTINGS_TYPE_ADS.png.sha1
index 1b11e9d..fca3d62 100644
--- a/components/site_settings_strings_grdp/IDS_SITE_SETTINGS_TYPE_ADS.png.sha1
+++ b/components/site_settings_strings_grdp/IDS_SITE_SETTINGS_TYPE_ADS.png.sha1
@@ -1 +1 @@
-7b1c71e13d0e93c6fbf5d060eb8e3e71f77e3b93
\ No newline at end of file
+2637c3d591c4e8246bd126a1764163881f26222f
\ No newline at end of file
diff --git a/components/site_settings_strings_grdp/IDS_SITE_SETTINGS_TYPE_ADS_MID_SENTENCE.png.sha1 b/components/site_settings_strings_grdp/IDS_SITE_SETTINGS_TYPE_ADS_MID_SENTENCE.png.sha1
index d9ef48b..78bed81 100644
--- a/components/site_settings_strings_grdp/IDS_SITE_SETTINGS_TYPE_ADS_MID_SENTENCE.png.sha1
+++ b/components/site_settings_strings_grdp/IDS_SITE_SETTINGS_TYPE_ADS_MID_SENTENCE.png.sha1
@@ -1 +1 @@
-ad66570980fa840a51628e2a4cec7bd9338b5452
\ No newline at end of file
+b0491a6073820fce835874c808900b1c52a13b31
\ No newline at end of file