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

Commit 407a6d27 authored by Becca Hughes's avatar Becca Hughes Committed by Android (Google) Code Review
Browse files

Merge "Update strings to match updated figma" into main

parents 3aa7212b 47469160

res/values/strings.xml

+7 −4
Original line number Diff line number Diff line
@@ -7318,7 +7318,7 @@ 
    <!-- Title for setting tile leading to saved autofill passwords, autofill, and account settings [CHAR LIMIT=40]-->

    <string name="account_dashboard_title">Passwords &amp; accounts</string>

    <!-- Summary for setting tile leading to saved autofill passwords, autofill, and account settings [CHAR LIMIT=NONE]-->

    <string name="account_dashboard_default_summary">Saved passwords, autofill, synced accounts</string>

    <string name="account_dashboard_default_summary">Suggestions for sign-in &amp; autofill</string>

    <!-- Title for setting tile leading to setting UI which allows user set default app to

    handle actions such as open web page, making phone calls, default SMS apps [CHAR  LIMIT=40]-->

    <string name="app_default_dashboard_title">Default apps</string>
@@ -10785,8 +10785,8 @@ 
    <string name="autofill_passwords">Passwords</string>

    <!-- Preference category for showing autofill and credman services with saved credentials. [CHAR LIMIT=60] -->

    <string name="credman_chosen_app_title">Preferred service</string>

    <!-- Preference category for showing additional credential providers. [CHAR LIMIT=60] -->

    <string name="credman_credentials">Additional providers</string>

    <!-- Preference category for showing additional credential services. [CHAR LIMIT=60] -->

    <string name="credman_credentials">Additional services</string>

    <!-- Summary for passwords settings that shows how many passwords are saved for each autofill

         service. [CHAR LIMIT=NONE] -->

    <string name="autofill_passwords_count">{count, plural,
@@ -10831,7 +10831,7 @@ 
    </string>









    <!-- Title of the screen where the user picks a provider. [CHAR_LIMIT=NONE] -->









    <string name="credman_picker_title">Passwords, passkeys, and data services</string>









    <string name="credman_picker_title">Preferred service for passwords, passkeys &amp; autofill</string>

















    <!-- Title of the warning dialog for disabling the credential provider. [CHAR_LIMIT=NONE] -->









    <string name="credman_confirmation_message_title">Turn off %1$s\?</string>








@@ -10848,6 +10848,9 @@







        ]]>









    </string>

















    <!-- Title for setting tile leading to saved autofill passwords, passkeys, autofill, and account settings [CHAR LIMIT=40]-->









    <string name="account_dashboard_title_with_passkeys">Passwords, passkeys &amp; autofill</string>

















    <!-- Message of the warning dialog for disabling the credential provider (new strings for 24Q3). [CHAR_LIMIT=NONE] -->









    <string name="credman_confirmation_message_new_ui">









        <![CDATA[

























res/xml/accounts_dashboard_settings_credman.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -18,7 +18,7 @@







    xmlns:android="http://schemas.android.com/apk/res/android"









    xmlns:settings="http://schemas.android.com/apk/res-auto"









    android:key="user_and_account_settings_screen"









    android:title="@string/account_dashboard_title"









    android:title="@string/account_dashboard_title_with_passkeys"









    settings:keywords="@string/keywords_accounts">



















    <PreferenceCategory
































res/xml/accounts_personal_dashboard_settings_credman.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -19,7 +19,7 @@







    xmlns:android="http://schemas.android.com/apk/res/android"









    xmlns:settings="http://schemas.android.com/apk/res-auto"









    android:key="user_and_account_settings_screen"









    android:title="@string/account_dashboard_title"









    android:title="@string/account_dashboard_title_with_passkeys"









    settings:keywords="@string/keywords_accounts">



















    <PreferenceCategory
































res/xml/accounts_private_dashboard_settings_credman.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -19,7 +19,7 @@







    xmlns:android="http://schemas.android.com/apk/res/android"









    xmlns:settings="http://schemas.android.com/apk/res-auto"









    android:key="user_and_account_settings_screen"









    android:title="@string/account_dashboard_title"









    android:title="@string/account_dashboard_title_with_passkeys"









    settings:keywords="@string/keywords_accounts">



















    <PreferenceCategory
































res/xml/accounts_work_dashboard_settings_credman.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -19,7 +19,7 @@







    xmlns:android="http://schemas.android.com/apk/res/android"









    xmlns:settings="http://schemas.android.com/apk/res-auto"









    android:key="user_and_account_settings_screen"









    android:title="@string/account_dashboard_title"









    android:title="@string/account_dashboard_title_with_passkeys"









    settings:keywords="@string/keywords_accounts">



















    <PreferenceCategory