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

Commit f80d661d authored by Qinmei Du's avatar Qinmei Du Committed by Android (Google) Code Review
Browse files

Merge "Update strings to localize well and change some strings and styles according to the design"

parents 1691b994 fb8f7905
Loading
Loading
Loading
Loading
+51 −22
Original line number Diff line number Diff line
@@ -3,44 +3,73 @@
  <!-- The name of this application. Credential Manager is a service that centralizes and provides
  access to a user's credentials used to sign in to various apps. [CHAR LIMIT=80] -->
  <string name="app_name">Credential Manager</string>

  <!-- Strings for the create flow. -->
  <!-- Button label to close the dialog when the user does not want to create the credential. [CHAR LIMIT=40] -->
  <string name="string_cancel">Cancel</string>
  <!-- Button label to confirm choosing the default dialog information and continue. [CHAR LIMIT=40] -->
  <string name="string_continue">Continue</string>
  <string name="string_more_options">More options</string>
  <!-- This appears as a text button where users can click to create this passkey in other available places. [CHAR LIMIT=80] -->
  <string name="string_create_in_another_place">Create in another place</string>
  <!-- This appears as a text button where users can click to create this password or other credential types in other available places. [CHAR LIMIT=80] -->
  <string name="string_save_to_another_place">Save to another place</string>
  <!-- This appears as a text button where users can click to use another device to create this credential. [CHAR LIMIT=80] -->
  <string name="string_use_another_device">Use another device</string>
  <!-- This appears as a text button where users can click to save this credential to another device. [CHAR LIMIT=80] -->
  <string name="string_save_to_another_device">Save to another device</string>
  <string name="string_no_thanks">No thanks</string>
  <!-- This appears as the title of the modal bottom sheet introducing what is passkey to users. [CHAR LIMIT=200] -->
  <string name="passkey_creation_intro_title">A simple way to sign in safely</string>
  <!-- This appears as the description body of the modal bottom sheet introducing what is passkey to users. [CHAR LIMIT=200] -->
  <string name="passkey_creation_intro_body">Use your fingerprint, face or screen lock to sign in with a unique passkey that can’t be forgotten or stolen. Learn more</string>
  <string name="choose_provider_title">Choose where to <xliff:g id="createTypes">%1$s</xliff:g></string>
  <!-- TODO: Change the wording after design is completed. -->
  <string name="choose_provider_body">This password manager will store your passwords, passkeys, and other sign-in info to help you easily sign in. You can change where to save your sign-in info at any time.</string>
  <string name="choose_create_option_passkey_title">Create a passkey in <xliff:g id="providerInfoDisplayName">%1$s</xliff:g>?</string>
  <string name="choose_create_option_password_title">Save your password to <xliff:g id="providerInfoDisplayName">%1$s</xliff:g>?</string>
  <string name="choose_create_option_sign_in_title">Save your sign-in info to <xliff:g id="providerInfoDisplayName">%1$s</xliff:g>?</string>
  <string name="choose_sign_in_title">Use saved sign in</string>
  <string name="create_your_passkey">create your passkey</string>
  <!-- This appears as the title of the modal bottom sheet which provides all available providers for users to choose. [CHAR LIMIT=200] -->
  <string name="choose_provider_title">Choose where to <xliff:g id="createTypes" example="create your passkeys">%1$s</xliff:g></string>
  <!-- Create types which are inserted as a placeholder for string choose_provider_title. [CHAR LIMIT=200] -->
  <string name="create_your_passkeys">create your passkeys</string>
  <string name="save_your_password">save your password</string>
  <string name="save_your_sign_in_info">save your sign-in info</string>
  <string name="create_passkey_in">Create passkey in</string>
  <string name="save_password_to">Save password to</string>
  <string name="save_sign_in_to">Save sign-in to</string>
  <string name="use_provider_for_all_title">Use <xliff:g id="providerInfoDisplayName">%1$s</xliff:g> for all your sign-ins?</string>
  <string name="set_as_default">Set as default</string>
  <string name="use_once">Use once</string>
  <string name="choose_create_option_description">You can use your <xliff:g id="appDomainName">%1$s</xliff:g> <xliff:g id="type">%2$s</xliff:g> on any device. It is saved to <xliff:g id="providerInfoDisplayName">%3$s</xliff:g> for <xliff:g id="createInfoDisplayName">%4$s</xliff:g></string>
  <string name="more_options_usage_passwords_passkeys"><xliff:g id="passwordsNumber">%1$s</xliff:g> passwords, <xliff:g id="passkeysNumber">%2$s</xliff:g> passkeys</string>
  <string name="more_options_usage_passwords"><xliff:g id="passwordsNumber">%1$s</xliff:g> passwords</string>
  <string name="more_options_usage_passkeys"><xliff:g id="passkeysNumber">%1$s</xliff:g> passkeys</string>

  <!-- This appears as the description body of the modal bottom sheet which provides all available providers for users to choose. [CHAR LIMIT=200] -->
  <string name="choose_provider_body">Set a default password manager to save your passwords and passkeys and sign in faster next time.</string>
  <!-- This appears as the title of the modal bottom sheet for users to choose the create option inside a provider when the credential type is passkey. [CHAR LIMIT=200] -->
  <string name="choose_create_option_passkey_title">Create a passkey in <xliff:g id="providerInfoDisplayName" example="Google Password Manager">%1$s</xliff:g>?</string>
  <!-- This appears as the title of the modal bottom sheet for users to choose the create option inside a provider when the credential type is password. [CHAR LIMIT=200] -->
  <string name="choose_create_option_password_title">Save your password to <xliff:g id="providerInfoDisplayName" example="Google Password Manager">%1$s</xliff:g>?</string>
  <!-- This appears as the title of the modal bottom sheet for users to choose the create option inside a provider when the credential type is others. [CHAR LIMIT=200] -->
  <string name="choose_create_option_sign_in_title">Save your sign-in info to <xliff:g id="providerInfoDisplayName" example="Google Password Manager">%1$s</xliff:g>?</string>
  <!-- This appears as the description body of the modal bottom sheet for users to choose the create option inside a provider. [CHAR LIMIT=200] -->
  <string name="choose_create_option_description">You can use your <xliff:g id="appDomainName" example="Tribank">%1$s</xliff:g> <xliff:g id="type" example="passkey">%2$s</xliff:g> on any device. It is saved to <xliff:g id="providerInfoDisplayName" example="Google Password Manager">%3$s</xliff:g> for <xliff:g id="createInfoDisplayName" example="elisa.beckett@gmail.com">%4$s</xliff:g></string>
  <!-- Types which are inserted as a placeholder for string choose_create_option_description. [CHAR LIMIT=200] -->
  <string name="passkey">passkey</string>
  <string name="password">password</string>
  <string name="sign_ins">sign-ins</string>

  <!-- This appears as the title of the modal bottom sheet for users to choose other available places the created passkey can be created to. [CHAR LIMIT=200] -->
  <string name="create_passkey_in_title">Create passkey in</string>
  <!-- This appears as the title of the modal bottom sheet for users to choose other available places the created password can be saved to. [CHAR LIMIT=200] -->
  <string name="save_password_to_title">Save password to</string>
  <!-- This appears as the title of the modal bottom sheet for users to choose other available places the created other credential types can be saved to. [CHAR LIMIT=200] -->
  <string name="save_sign_in_to_title">Save sign-in to</string>
  <!-- This appears as the title of the modal bottom sheet for users to confirm whether they should use the selected provider as default or not. [CHAR LIMIT=200] -->
  <string name="use_provider_for_all_title">Use <xliff:g id="providerInfoDisplayName" example="Google Password Manager">%1$s</xliff:g> for all your sign-ins?</string>
  <!-- TODO: Check the wording here. -->
  <!-- This appears as the description body of the modal bottom sheet for users to confirm whether they should use the selected provider as default or not. [CHAR LIMIT=200] -->
  <string name="use_provider_for_all_description">This password manager will store your passwords and passkeys to help you easily sign in.</string>
  <!-- Button label to set the selected provider on the modal bottom sheet as default. [CHAR LIMIT=40] -->
  <string name="set_as_default">Set as default</string>
  <!-- Button label to set the selected provider on the modal bottom sheet not as default but just use once. [CHAR LIMIT=40] -->
  <string name="use_once">Use once</string>
  <!-- Appears as an option row subtitle to show how many passwords and passkeys are saved in this option when there are passwords and passkeys. [CHAR LIMIT=80] -->
  <string name="more_options_usage_passwords_passkeys"><xliff:g id="passwordsNumber" example="1">%1$s</xliff:g> passwords, <xliff:g id="passkeysNumber" example="2">%2$s</xliff:g> passkeys</string>
  <!-- Appears as an option row subtitle to show how many passwords and passkeys are saved in this option when there are only passwords. [CHAR LIMIT=80] -->
  <string name="more_options_usage_passwords"><xliff:g id="passwordsNumber" example="3">%1$s</xliff:g> passwords</string>
  <!-- Appears as an option row subtitle to show how many passwords and passkeys are saved in this option when there are only passkeys. [CHAR LIMIT=80] -->
  <string name="more_options_usage_passkeys"><xliff:g id="passkeysNumber" example="4">%1$s</xliff:g> passkeys</string>
  <!-- Appears before a request display name when the credential type is passkey . [CHAR LIMIT=80] -->
  <string name="passkey_before_subtitle">Passkey</string>
  <!-- Appears as an option row title that users can choose to use another device for this creation. [CHAR LIMIT=80] -->
  <string name="another_device">Another device</string>
  <!-- Appears as an option row title that users can choose to view other disabled providers. [CHAR LIMIT=80] -->
  <string name="other_password_manager">Other password managers</string>
  <!-- TODO: Check the wording here. -->
  <string name="confirm_default_or_use_once_description">This password manager will store your passwords and passkeys to help you easily sign in.</string>
  <!-- Spoken content description of an element which will close the sheet when clicked. -->
  <string name="close_sheet">"Close sheet"</string>
  <!-- Spoken content description of the back arrow button. -->
+9 −5
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ fun ProviderSelectionCard(
        text = stringResource(
          R.string.choose_provider_title,
          when (requestDisplayInfo.type) {
            TYPE_PUBLIC_KEY_CREDENTIAL -> stringResource(R.string.create_your_passkey)
            TYPE_PUBLIC_KEY_CREDENTIAL -> stringResource(R.string.create_your_passkeys)
            TYPE_PASSWORD_CREDENTIAL -> stringResource(R.string.save_your_password)
            else -> stringResource(R.string.save_your_sign_in_info)
          },
@@ -273,6 +273,10 @@ fun ProviderSelectionCard(
          }
        }
      }
      Divider(
        thickness = 24.dp,
        color = Color.Transparent
      )
      Row(
        horizontalArrangement = Arrangement.Start,
        modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp)
@@ -305,9 +309,9 @@ fun MoreOptionsSelectionCard(
        title = {
          Text(
            text = when (requestDisplayInfo.type) {
              TYPE_PUBLIC_KEY_CREDENTIAL -> stringResource(R.string.create_passkey_in)
              TYPE_PASSWORD_CREDENTIAL -> stringResource(R.string.save_password_to)
              else -> stringResource(R.string.save_sign_in_to)
              TYPE_PUBLIC_KEY_CREDENTIAL -> stringResource(R.string.create_passkey_in_title)
              TYPE_PASSWORD_CREDENTIAL -> stringResource(R.string.save_password_to_title)
              else -> stringResource(R.string.save_sign_in_to_title)
            },
            style = MaterialTheme.typography.titleMedium
          )
@@ -398,7 +402,7 @@ fun MoreOptionsRowIntroCard(
        textAlign = TextAlign.Center,
      )
      Text(
        text = stringResource(R.string.confirm_default_or_use_once_description),
        text = stringResource(R.string.use_provider_for_all_description),
        style = MaterialTheme.typography.bodyLarge,
        modifier = Modifier.padding(all = 24.dp).align(alignment = Alignment.CenterHorizontally)
      )
+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ fun PrimarySelectionCard(
        horizontalArrangement = Arrangement.Start,
        modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp)
      ) {
        CancelButton(stringResource(R.string.string_no_thanks), onCancel)
        CancelButton(stringResource(R.string.get_dialog_button_label_no_thanks), onCancel)
      }
      Divider(
        thickness = 18.dp,