Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a015e2c8 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[ToA] Terms of Address UI, string and locale list" into main

parents ae32c8e8 5a256e35

res/values/arrays.xml

+10 −0
Original line number Diff line number Diff line
@@ -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>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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,