From 47b61425f0b5ee308d0981496b8276415b37cca2 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Wed, 22 Jun 2022 15:39:24 -0400
Subject: [PATCH] [components] Issue
 https://github.com/mozilla-mobile/android-components/issues/12372 - Update
 the "Select addresses" text to "Select address"

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@758203dd5c78ee384fcaa04de63b1d8b67a9d9a6
---
 _meta/mozilla-mobile-firefox-android.json                   | 2 +-
 .../feature/prompts/src/main/res/values/strings.xml         | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 6ea83745ae1..c070cb9a49d 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": "108a370e363e27d856dea9504fdb104f275093d7"
+    "ac-prep": "758203dd5c78ee384fcaa04de63b1d8b67a9d9a6"
   }
 }
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
index 60556addb4c..3b8896d74d7 100644
--- a/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/prompts/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- Text for confirmation for a positive action in dialog  -->
     <string name="mozac_feature_prompts_ok">OK</string>
     <!-- Text for confirmation for a negative action in dialog.  -->
@@ -116,7 +116,9 @@
 
     <!-- Address Autofill -->
     <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
-    <string name="mozac_feature_prompts_select_address">Select addresses</string>
+    <string moz:removedIn="104" name="mozac_feature_prompts_select_address" tools:ignore="UnusedResources">Select addresses</string>
+    <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
+    <string name="mozac_feature_prompts_select_address_2">Select address</string>
     <!-- Content description for expanding the select addresses options in the select address prompt. -->
     <string name="mozac_feature_prompts_expand_address_content_description">Expand suggested addresses</string>
     <!-- Content description for collapsing the select address options in the select address prompt. -->