From fec74f8d59d6569bc9ac43603d1f4feb923d41e2 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Fri, 18 May 2018 14:55:54 +0200
Subject: [PATCH] [components] Issue
 https://github.com/mozilla-mobile/android-components/issues/173: Toolbar: Add
 support for dynamic display actions.

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@d93c285828d62452dabf409f158d8217f127f051
---
 _meta/mozilla-mobile-firefox-android.json           |  6 ++++++
 l10n.toml                                           |  3 +++
 .../browser/toolbar/src/main/res/values/strings.xml | 13 -------------
 3 files changed, 9 insertions(+), 13 deletions(-)
 create mode 100644 _meta/mozilla-mobile-firefox-android.json

diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
new file mode 100644
index 00000000000..63a3e101018
--- /dev/null
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -0,0 +1,6 @@
+{
+  "name": "mozilla-mobile/firefox-android",
+  "revs": {
+    "ac-prep": "d93c285828d62452dabf409f158d8217f127f051"
+  }
+}
\ No newline at end of file
diff --git a/l10n.toml b/l10n.toml
index 3b204c006bf..f31a883d300 100644
--- a/l10n.toml
+++ b/l10n.toml
@@ -6,5 +6,8 @@ basepath = "."
 [[includes]]
     path = "mozilla-mobile/fenix/l10n.toml"
 
+[[includes]]
+    path = "mozilla-mobile/firefox-android/android-components/l10n.toml"
+
 [[includes]]
     path = "mozilla-mobile/focus-android/l10n.toml"
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 63bd4a57696..bc3ca630e4a 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
@@ -2,17 +2,4 @@
 <resources>
     <!-- Content description (not visible, for screen readers etc.): Description for the overflow menu button in the browser toolbar. -->
     <string name="mozac_browser_toolbar_menu_button">Menu</string>
-    <string name="mozac_clear_button_description">Clear</string>
-    <!-- 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_blocked1">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_site1">Tracking Protection is off for this site</string>
-    <!-- Content description: For the site security information icon (the site security icon).-->
-    <string name="mozac_browser_toolbar_content_description_site_info">Site information</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>
-    <!-- Content description: For the autoplay toolbar icon, it is set when the auto play permission is blocking content playing.-->
-    <string name="mozac_browser_toolbar_content_description_autoplay_blocked">Some content has been blocked by the autoplay setting</string>
 </resources>