From c7d68cf1f5e847b7f71289933c0489779047d8a7 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Thu, 15 Aug 2019 13:49:49 -0400
Subject: [PATCH] [components] Update month chooser strings descriptions

X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@f2b1549ae36cd1142d3ec00a72d7d01832a1936c
---
 _meta/mozilla-mobile-firefox-android.json     |  2 +-
 .../toolbar/src/main/res/values/strings.xml   |  4 ++--
 .../prompts/src/main/res/values/strings.xml   | 24 +++++++++----------
 .../lib/crash/src/main/res/values/strings.xml |  2 ++
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 7416def50d2..3e105f60ff8 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
 {
   "name": "mozilla-mobile/firefox-android",
   "revs": {
-    "ac-prep": "01affcf6c800f0801233a43c41eb78f2b8607704"
+    "ac-prep": "f2b1549ae36cd1142d3ec00a72d7d01832a1936c"
   }
 }
\ No newline at end of file
diff --git a/mozilla-mobile/firefox-android/android-components/components/browser/toolbar/src/main/res/values/strings.xml b/mozilla-mobile/firefox-android/android-components/components/browser/toolbar/src/main/res/values/strings.xml
index cb42acf50e3..114b8735e0c 100644
--- a/mozilla-mobile/firefox-android/android-components/components/browser/toolbar/src/main/res/values/strings.xml
+++ b/mozilla-mobile/firefox-android/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 has blocked trackers</string>
+    <string name="mozac_browser_toolbar_content_description_tracking_protection_on_trackers_blocked">Tracking Protection is active blocking 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 off for this site</string>
+    <string name="mozac_browser_toolbar_content_description_tracking_protection_off_for_a_site">Tracking Protection is disabled 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/firefox-android/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/firefox-android/android-components/components/feature/prompts/src/main/res/values/strings.xml
index 7849cfd1560..8b377175d9e 100644
--- a/mozilla-mobile/firefox-android/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/firefox-android/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -27,28 +27,28 @@
     <string name="mozac_feature_prompts_deny">Deny</string>
     <!-- Title of the month chooser dialog. -->
     <string name="mozac_feature_prompts_set_month">Pick a month</string>
-    <!-- January (3 character long), used on the month chooser dialog. -->
+    <!-- January (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_jan">Jan</string>
-    <!-- February month of the year (3 character long), used on the month chooser dialog. -->
+    <!-- February month of the year (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_feb">Feb</string>
-    <!-- March month of the year (3 character long), used on the month chooser dialog. -->
+    <!-- March month of the year (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_mar">Mar</string>
-    <!-- April month of the year (3 character long), used on the month chooser dialog. -->
+    <!-- April month of the year (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_apr">Apr</string>
-    <!-- May month of the year (3 character long), used on the month chooser dialog. -->
+    <!-- May month of the year (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_may">May</string>
-    <!-- June month of the year (3 character long), used on the month chooser dialog. -->
+    <!-- June month of the year (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_jun">Jun</string>
-    <!-- July month of the year (3 character long), used on the month chooser dialog. -->
+    <!-- July month of the year (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_jul">Jul</string>
-    <!-- August month of the year (3 character long), used on the month chooser dialog. -->
+    <!-- August month of the year (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_aug">Aug</string>
-    <!-- September month of the year (3 character long), used on the month chooser dialog. -->
+    <!-- September month of the year (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_sep">Sep</string>
-    <!-- October month of the year (3 character long), used on the month chooser dialog. -->
+    <!-- October month of the year (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_oct">Oct</string>
-    <!-- November month of the year (3 character long), used on the month chooser dialog. -->
+    <!-- November month of the year (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_nov">Nov</string>
-    <!-- December month of the year (3 character long), used on the month chooser dialog. -->
+    <!-- December month of the year (short description), used on the month chooser dialog. -->
     <string name="mozac_feature_prompts_dec">Dec</string>
 </resources>
diff --git a/mozilla-mobile/firefox-android/android-components/components/lib/crash/src/main/res/values/strings.xml b/mozilla-mobile/firefox-android/android-components/components/lib/crash/src/main/res/values/strings.xml
index 003a5b67d29..a542a29c19c 100644
--- a/mozilla-mobile/firefox-android/android-components/components/lib/crash/src/main/res/values/strings.xml
+++ b/mozilla-mobile/firefox-android/android-components/components/lib/crash/src/main/res/values/strings.xml
@@ -18,4 +18,6 @@
     <!-- 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>