Merge "[ToA] Terms of Address UI, string and locale list" into main
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 552ca3f..81c87f7 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1425,4 +1425,14 @@
<item>@string/battery_tips_card_dismiss_button</item>
</string-array>
+ <!-- A list of not supporting Terms of Address. [DO NOT TRANSLATE] -->
+ <string-array name="terms_of_address_unsupported_locale">
+ <item>fr-CA</item> <!-- French (Canada) -->
+ </string-array>
+
+ <!-- A list of supporting Terms of Address. [DO NOT TRANSLATE] -->
+ <string-array name="terms_of_address_supported_locale">
+ <item>en-XA</item> <!-- English (Pseudo-Accents) -->
+ <item>ar-XB</item> <!-- Arabic (Pseudo-Bidi) -->
+ </string-array>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4033c39..1ef051e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -459,6 +459,8 @@
<string name="terms_of_address_feminine">Feminine</string>
<!-- The title of masculine of terms of address. [CHAR LIMIT=NONE] -->
<string name="terms_of_address_masculine">Masculine</string>
+ <!-- The title of neutral of terms of address. [CHAR LIMIT=NONE] -->
+ <string name="terms_of_address_neutral">Neutral</string>
<!-- The title of the confirmation dialog shown when the user selects one / several languages and tries to remove them [CHAR LIMIT=60] -->
<string name="dlg_remove_locales_title">{count, plural,