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

Commit c960420e authored by Helen Qin's avatar Helen Qin Committed by Automerger Merge Worker
Browse files

Merge "Update strings based on new product decisions" into udc-dev am: 51a83871 am: 7c00cfa9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22976516



Change-Id: I11e72e1d6301247356c03c26e4a22fbe735e59dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b7bfd857 7c00cfa9

packages/CredentialManager/res/values/strings.xml

+4 −2
Original line number Original line Diff line number Diff line
@@ -24,8 +24,8 @@ 
  <string name="string_cancel">Cancel</string>

  <string name="string_cancel">Cancel</string>

  <!-- This is a label for a button that takes user to the next screen. [CHAR LIMIT=20] -->

  <!-- This is a label for a button that takes user to the next screen. [CHAR LIMIT=20] -->

  <string name="string_continue">Continue</string>

  <string name="string_continue">Continue</string>

  <!-- This is a label for a button that links to different places where the user can save their passkeys. [CHAR LIMIT=20] -->

  <!-- This is a label for a button that leads to a holistic view of all different options where the user can save their new app credential. [CHAR LIMIT=20] -->

  <string name="string_more_options">More options</string>

  <string name="string_more_options">Save another way</string>

  <!-- This is a label for a button that links to additional information about passkeys. [CHAR LIMIT=20] -->

  <!-- This is a label for a button that links to additional information about passkeys. [CHAR LIMIT=20] -->

  <string name="string_learn_more">Learn more</string>

  <string name="string_learn_more">Learn more</string>

  <!-- This is a label for content description for show password icon button. -->

  <!-- This is a label for content description for show password icon button. -->
@@ -120,6 +120,8 @@ 
  <!-- Strings for the get flow. -->

  <!-- Strings for the get flow. -->

  <!-- This appears as the title of the modal bottom sheet asking for user confirmation to use the single previously saved passkey to sign in to the app. [CHAR LIMIT=200] -->

  <!-- This appears as the title of the modal bottom sheet asking for user confirmation to use the single previously saved passkey to sign in to the app. [CHAR LIMIT=200] -->

  <string name="get_dialog_title_use_passkey_for">Use your saved passkey for <xliff:g id="app_name" example="YouTube">%1$s</xliff:g>?</string>

  <string name="get_dialog_title_use_passkey_for">Use your saved passkey for <xliff:g id="app_name" example="YouTube">%1$s</xliff:g>?</string>

  <!-- This appears as the title of the modal bottom sheet asking for user confirmation to use the single previously saved password to sign in to the app. [CHAR LIMIT=200] -->

  <string name="get_dialog_title_use_password_for">Use your saved password for <xliff:g id="app_name" example="YouTube">%1$s</xliff:g>?</string>

  <!-- This appears as the title of the dialog asking for user confirmation to use the single user credential (previously saved or to be created) to sign in to the app. [CHAR LIMIT=200] -->

  <!-- This appears as the title of the dialog asking for user confirmation to use the single user credential (previously saved or to be created) to sign in to the app. [CHAR LIMIT=200] -->

  <string name="get_dialog_title_use_sign_in_for">Use your sign-in for <xliff:g id="app_name" example="YouTube">%1$s</xliff:g>?</string>

  <string name="get_dialog_title_use_sign_in_for">Use your sign-in for <xliff:g id="app_name" example="YouTube">%1$s</xliff:g>?</string>

  <!-- This appears as the title of the dialog asking for user to make a choice from various available user credentials (previously saved or to be created) to sign in to the app. [CHAR LIMIT=200] -->

  <!-- This appears as the title of the dialog asking for user to make a choice from various available user credentials (previously saved or to be created) to sign in to the app. [CHAR LIMIT=200] -->