From e1625559a34e3f65849c060f703223d61e2ae437 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Wed, 14 Aug 2019 19:25:21 -0400
Subject: [PATCH] [components] Closes
 https://github.com/mozilla-mobile/android-components/issues/3925: Adding
 meaningful content descriptions to tracking protection toolbar icon for
 different states.

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@01affcf6c800f0801233a43c41eb78f2b8607704
---
 _meta/mozilla-mobile-firefox-android-android-components.json  | 2 +-
 .../browser/toolbar/src/main/res/values/strings.xml           | 4 ++--
 .../components/lib/crash/src/main/res/values/strings.xml      | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/_meta/mozilla-mobile-firefox-android-android-components.json b/_meta/mozilla-mobile-firefox-android-android-components.json
index 2fc01c2f696..97c162c461d 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": "58310fd85818fe5cb736fc03d2529d5350d1e875"
+    "main": "01affcf6c800f0801233a43c41eb78f2b8607704"
   }
 }
\ 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>
diff --git a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
index a542a29c19c..003a5b67d29 100644
--- a/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/lib/crash/src/main/res/values/strings.xml
@@ -18,6 +18,4 @@
     <!-- Label of a notification action/button that will send the crash report to Mozilla. -->
     <string name="mozac_lib_crash_notification_action_report">Report</string>
 
-    <!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
-    <string name="mozac_lib_send_crash_report_in_progress">Sending crash report to %1$s</string>
 </resources>