diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/masterpasswordhint/MasterPasswordHintScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/masterpasswordhint/MasterPasswordHintScreenTest.kt index 850c1818a6..ad966d9e72 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/masterpasswordhint/MasterPasswordHintScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/masterpasswordhint/MasterPasswordHintScreenTest.kt @@ -53,7 +53,7 @@ class MasterPasswordHintScreenTest : BitwardenComposeTest() { ) composeTestRule - .onNodeWithText("We've sent you an email with your master password hint.") + .onNodeWithText("We’ve sent you an email with your master password hint.") .assertIsDisplayed() } diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreenTest.kt index 3bdf53d249..2333c2acc7 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreenTest.kt @@ -309,7 +309,7 @@ class TwoFactorLoginScreenTest : BitwardenComposeTest() { } composeTestRule.onNode( hasText( - text = "We don't recognize this device", + text = "We don’t recognize this device", substring = true, ignoreCase = true, ), diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreenTest.kt index d92227c0fd..a2e1e85ba0 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreenTest.kt @@ -1104,14 +1104,14 @@ class AccountSecurityScreenTest : BitwardenComposeTest() { .performClick() composeTestRule - .onAllNodesWithText("Set session timeout to \"Log out\"?") + .onAllNodesWithText("Set session timeout to “Log out”?") .filterToOne(hasAnyAncestor(isDialog())) .assertIsDisplayed() composeTestRule .onAllNodesWithText( text = "After the timeout period, you will be logged out. You will need to be " + "connected to the internet to log in and access your vault again. Your " + - "settings and PIN saved on this device won\'t change.", + "settings and PIN saved on this device won’t change.", ) .filterToOne(hasAnyAncestor(isDialog())) .assertIsDisplayed() @@ -1143,7 +1143,7 @@ class AccountSecurityScreenTest : BitwardenComposeTest() { .performClick() composeTestRule - .onAllNodesWithText("Set session timeout to \"Log out\"?") + .onAllNodesWithText("Set session timeout to “Log out”?") .filterToOne(hasAnyAncestor(isDialog())) .assertIsDisplayed() composeTestRule @@ -1172,7 +1172,7 @@ class AccountSecurityScreenTest : BitwardenComposeTest() { .performClick() composeTestRule - .onAllNodesWithText("Set session timeout to \"Log out\"?") + .onAllNodesWithText("Set session timeout to “Log out”?") .filterToOne(hasAnyAncestor(isDialog())) .assertIsDisplayed() composeTestRule diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/privilegedapps/about/AboutPrivilegedAppsScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/privilegedapps/about/AboutPrivilegedAppsScreenTest.kt index 1c4e1735cd..ca0f3062dc 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/privilegedapps/about/AboutPrivilegedAppsScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/privilegedapps/about/AboutPrivilegedAppsScreenTest.kt @@ -70,7 +70,7 @@ class AboutPrivilegedAppsScreenTest : BitwardenComposeTest() { composeTestRule .onNodeWithText( - "These are applications Google considers safe and are available in Google's " + + "These are applications Google considers safe and are available in Google’s " + "Play Store.", ) .assertIsDisplayed() diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index 820c71a731..91327978cc 100644 --- a/ui/src/main/res/values/strings.xml +++ b/ui/src/main/res/values/strings.xml @@ -101,8 +101,8 @@ 1 minute 4 hours Immediately - Set session timeout to \"Log out\"? - After the timeout period, you will be logged out. You will need to be connected to the internet to log in and access your vault again. Your settings and PIN saved on this device won\'t change. + Set session timeout to “Log out”? + After the timeout period, you will be logged out. You will need to be connected to the internet to log in and access your vault again. Your settings and PIN saved on this device won’t change. Logging in… Log in to Bitwarden Password confirmation is not correct. @@ -136,7 +136,7 @@ Other Password generator Password hint - We\'ve sent you an email with your master password hint. + We’ve sent you an email with your master password hint. Are you sure you want to overwrite the current password? Re-type master password Re-type new master password (required) @@ -164,7 +164,7 @@ There are no items in your vault that match “%1$s” Search for a login or add a new login Disabled - The easiest way to add new logins to your vault is from the Bitwarden Autofill Service. Learn more about using the Bitwarden Autofill Service by navigating to the \"Settings\" screen. + The easiest way to add new logins to your vault is from the Bitwarden Autofill Service. Learn more about using the Bitwarden Autofill Service by navigating to the “Settings” screen. Autofill Do you want to autofill or view this item? Search @@ -172,14 +172,14 @@ Authenticator app Enter the 6 digit verification code from your authenticator app. Enter the 6 digit verification code that was emailed to %1$s. - We don\'t recognize this device. Enter the code sent to your email to verify your identity. + We don’t recognize this device. Enter the code sent to your email to verify your identity. Recovery code Remember Remember email Resend code Could not send verification email. Try again. Verification email sent - To continue, hold your YubiKey NEO against the back of the device or insert your YubiKey into your device\'s USB port, then touch its button. + To continue, hold your YubiKey NEO against the back of the device or insert your YubiKey into your device’s USB port, then touch its button. YubiKey security key Add new attachment Attachments @@ -342,7 +342,7 @@ Scanning will happen automatically. Generator There are no folders to list. Fingerprint phrase - Your account\'s fingerprint phrase + Your account’s fingerprint phrase Export vault Lock now PIN @@ -364,14 +364,14 @@ Scanning will happen automatically. Default URI match detection URI match detection controls how Bitwarden identifies autofill suggestions. Theme - Change the application\'s color theme + Change the application’s color theme Copy note Exit Are you sure you want to exit Bitwarden? Require master password on app restart? Do you want to require unlocking with your master password when the application is restarted? Ask to add item - Ask to add an item if one isn\'t found in your vault. + Ask to add an item if one isn’t found in your vault. On app restart Capitalize Include number @@ -390,13 +390,13 @@ Scanning will happen automatically. This file export will be password protected and require the file password to decrypt. Confirm vault export Warning - There was a problem exporting your vault. If the problem persists, you\'ll need to export from the web vault. + There was a problem exporting your vault. If the problem persists, you’ll need to export from the web vault. Vault exported successfully Clone One or more organization policies are affecting your generator settings There was a problem saving this attachment. If the problem persists, you can save it from the web vault. Attachment saved successfully - Please turn on \"Autofill Accessibility Service\" from Bitwarden Settings to use the Autofill tile. + Please turn on “Autofill Accessibility Service” from Bitwarden Settings to use the Autofill tile. No password fields detected Sending to trash… Item has been sent to trash. @@ -411,7 +411,7 @@ Scanning will happen automatically. Allow sync on refresh Syncing vault with pull down gesture. Enterprise single sign-on - Quickly log in using your organization\'s single sign-on portal. Please enter your organization\'s identifier to begin. + Quickly log in using your organization’s single sign-on portal. Please enter your organization’s identifier to begin. Organization identifier Currently unable to login with SSO Set master password @@ -576,8 +576,8 @@ select Add TOTP to store the key safely API access token Are you sure you want to overwrite the current username? Generate username - Use your email provider\'s subaddress capabilities - Use your domain\'s configured catch-all inbox. + Use your email provider’s subaddress capabilities + Use your domain’s configured catch-all inbox. Generate an email alias with an external forwarding service. Accessibility Service Disclosure Bitwarden uses the Accessibility Service to search for login fields in apps and websites, then establish the appropriate field IDs for entering a username & password when a match for the app or site is found. We do not store any of the information presented to us by the service, nor do we make any attempt to control any on-screen elements beyond text entry of credentials. @@ -763,7 +763,7 @@ Do you want to switch to this account? Turn on autofill later? You can return to complete this step anytime in Settings. You can now explore everything Bitwarden has to offer and start managing your passwords securely. - You\'re all set! + You’re all set! Error connecting with the Duo service. Use a different two-step login method or contact Duo for assistance. Master password hint New master password hint @@ -861,7 +861,7 @@ Do you want to switch to this account? 3 OF 3 You must add a web address to use autofill to access this account. Learn about new logins - We\'ll walk you through the key features to add a new login. + We’ll walk you through the key features to add a new login. Explore the generator Learn more about generating secure login credentials with a guided tour. Import client certificate @@ -876,7 +876,7 @@ Do you want to switch to this account? 4 OF 6 5 OF 6 6 OF 6 - Use these options to adjust your password to meet your account website\'s requirements. + Use these options to adjust your password to meet your account website’s requirements. "After you save your new password to Bitwarden, don’t forget to update it on your account website. " Verify your identity Error loading certificate @@ -950,7 +950,7 @@ Do you want to switch to this account? Log deleted App settings Replace existing certificate? - A certificate with the alias \"%s\" already exists. Do you want to replace it?\nReplacing the certificate may impact your connection to any environments currently using it. + A certificate with the alias “%s” already exists. Do you want to replace it?\nReplacing the certificate may impact your connection to any environments currently using it. Replace certificate Unable to read certificate. Cannot delete your account @@ -963,12 +963,12 @@ Do you want to switch to this account? Use dynamic colors Use dynamic colors? This color scheme automatically applies system colors to Bitwarden based on your current wallpaper. These colors may not meet all accessibility guidelines. - Passkey operation failed because browser (%1$s) is not recognized. Select \"Trust\" to add %1$s to the list of locally trusted applications. + Passkey operation failed because browser (%1$s) is not recognized. Select “Trust” to add %1$s to the list of locally trusted applications. Passkey operation failed because the browser is not trusted. Trust These are applications or browsers that Bitwarden does not trust by default, but you trust to perform passkey operations. These are applications not included in the Google Play Store, but Bitwarden trusts to perform passkey operations after community members use and report them as safe. - These are applications Google considers safe and are available in Google\'s Play Store. + These are applications Google considers safe and are available in Google’s Play Store. Trusted by You Trusted by the Community Trusted by Google @@ -989,7 +989,7 @@ Do you want to switch to this account? Cannot add authenticator key? Enable camera permission to use the scanner Empty Item Listing - You don\'t have any items to display. + You don’t have any items to display. Add a new code to secure your accounts. Add code Verification code added @@ -1011,7 +1011,7 @@ Do you want to switch to this account? Use your device camera to scan codes Scan the QR code in your 2-step verification settings for any account. Sign in using unique codes - When using 2-step verification, you\'ll enter your username and password and a code generated in this app. + When using 2-step verification, you’ll enter your username and password and a code generated in this app. Skip Help Launch tutorial