From d2bcf1d46b32b29e4864370b8159dd42d9d3b7bf Mon Sep 17 00:00:00 2001
From: MozLando <skaspari+mozlando@mozilla.com>
Date: Fri, 23 Aug 2019 19:32:43 +0000
Subject: [PATCH] [components] Merge
 https://github.com/mozilla-mobile/android-components/pull/4130

4130: Closes https://github.com/mozilla-mobile/android-components/issues/3925: Adding meaningful content descriptions to tracking protection toolbar icon for different states. r=rocketsroger a=Amejia481



Co-authored-by: Arturo Mejia <arturomejiamarmol@gmail.com>

X-Channel-Revision: [main] mozilla-mobile/android-components@96444ddbd36acf0987ca531574187647bc74b5f3
X-Channel-Revision: [main] mozilla-mobile/fenix@d039188782084c5475112e6d98ab829c7992e759
X-Channel-Revision: [main] mozilla-mobile/focus-android@a9a09b171665081b4e5f4d426f0e30f22f84ae49
X-Channel-Converted-Revision: [main] mozilla-mobile/firefox-android@a5f043c2becd030d7856d2ee93a1cef2652c8f22
---
 _meta/mozilla-mobile-firefox-android-android-components.json  | 2 +-
 .../browser/toolbar/src/main/res/values/strings.xml           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/_meta/mozilla-mobile-firefox-android-android-components.json b/_meta/mozilla-mobile-firefox-android-android-components.json
index 5c31fe0e26c..4342353c9ef 100644
--- a/_meta/mozilla-mobile-firefox-android-android-components.json
+++ b/_meta/mozilla-mobile-firefox-android-android-components.json
@@ -1,6 +1,6 @@
 {
   "name": "mozilla-mobile/firefox-android/android-components",
   "revs": {
-    "main": "1bbaf50133bd57062d2bf9248bfc542fddef2ff4"
+    "main": "a5f043c2becd030d7856d2ee93a1cef2652c8f22"
   }
 }
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index 114b8735e0c..cb42acf50e3 100644
--- a/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/toolbar/src/main/res/values/strings.xml
@@ -6,9 +6,9 @@
     <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, but none trackers have been blocked or detected. -->
     <string name="mozac_browser_toolbar_content_description_tracking_protection_on_no_trackers_blocked">Tracking Protection is on</string>
     <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection enabled, and trackers have been blocked or detected.-->
-    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_trackers_blocked">Tracking Protection is active blocking trackers</string>
+    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_trackers_blocked">Tracking Protection has blocked trackers</string>
     <!-- Content description: For the tracking protection toolbar icon, it is set when the site has tracking protection disabled.-->
-    <string name="mozac_browser_toolbar_content_description_tracking_protection_off_for_a_site">Tracking Protection is disabled for this site</string>
+    <string name="mozac_browser_toolbar_content_description_tracking_protection_off_for_a_site">Tracking Protection is off for this site</string>
     <!-- Announcement made by the screen reader when the progress bar is shown and a page is loading -->
     <string name="mozac_browser_toolbar_progress_loading">Loading</string>
 </resources>