From f3f008cd0abaef8fac02f32b662cd8172be1b010 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Tue, 2 Jul 2019 11:49:38 -0400
Subject: [PATCH] [components] Closes
 https://github.com/mozilla-mobile/android-components/issues/3584: Api for
 supporting language switching.

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@ce4d369a5b30b1ffa576184a462fd5c76bc42d6a
---
 _meta/mozilla-mobile-firefox-android.json                    | 2 +-
 .../components/support/base/src/main/res/values/strings.xml  | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 5304096ab1d..48b5994121e 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": "b469211987ec43e4ed23acaa45cc160f5efff916"
+    "ac-prep": "ce4d369a5b30b1ffa576184a462fd5c76bc42d6a"
   }
 }
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/support/base/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/support/base/src/main/res/values/strings.xml
index 815bb46e4f0..021ff2dcc18 100644
--- a/mozilla-mobile/android-components/components/support/base/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/support/base/src/main/res/values/strings.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Text for the positive action button, that will take the user to the settings page -->
-    <string name="mozac_support_base_permissions_needed_positive_button">Go to settings</string>
-    <!-- Text for the negative action button to dismiss the dialog. -->
-    <string name="mozac_support_base_permissions_needed_negative_button">Dismiss</string>
+    <string name="mozac_support_base_locale_preference_key_locale" translatable="false">mozac_support_base_locale_preference_key_locale</string>
 </resources>