diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e09ebf73e9..245529205c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -249,7 +249,7 @@ android:name="com.x8bit.bitwarden.AutofillTileService" android:exported="true" android:icon="@drawable/ic_notification" - android:label="@string/autofill" + android:label="@string/autofill_title" android:permission="android.permission.BIND_QUICK_SETTINGS_TILE" tools:ignore="MissingClass"> diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/SearchContent.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/SearchContent.kt index dce11ceb2e..1bd652f95e 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/SearchContent.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/SearchContent.kt @@ -219,7 +219,7 @@ private fun AutofillSelectionDialog( selectionItems = { if (AutofillSelectionOption.AUTOFILL in displayItem.autofillSelectionOptions) { BitwardenBasicDialogRow( - text = stringResource(id = BitwardenString.autofill), + text = stringResource(id = BitwardenString.autofill_title), onClick = { selectionCallback( displayItem, diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsViewModel.kt index 37b19b277a..b4036c3ac3 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsViewModel.kt @@ -241,7 +241,7 @@ enum class Settings( testTag = "AccountSecuritySettingsButton", ), AUTO_FILL( - text = BitwardenString.autofill.asText(), + text = BitwardenString.autofill_title.asText(), vectorIconRes = BitwardenDrawable.ic_check_mark, testTag = "AutofillSettingsButton", ), diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt index 9ff4afb15b..b269ff886a 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt @@ -141,7 +141,7 @@ fun AutoFillScreen( .nestedScroll(scrollBehavior.nestedScrollConnection), topBar = { BitwardenTopAppBar( - title = stringResource(id = BitwardenString.autofill), + title = stringResource(id = BitwardenString.autofill_title), scrollBehavior = scrollBehavior, navigationIcon = rememberVectorPainter(id = BitwardenDrawable.ic_back), navigationIconContentDescription = stringResource(id = BitwardenString.back), @@ -187,7 +187,7 @@ private fun AutoFillScreenContent( ) } BitwardenListHeaderText( - label = stringResource(id = BitwardenString.autofill), + label = stringResource(id = BitwardenString.autofill_title), modifier = Modifier .fillMaxWidth() .standardHorizontalMargin() diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt index 6d3990363b..a7cfc40657 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt @@ -353,7 +353,7 @@ class ImportLoginsScreenTest : BitwardenComposeTest() { it.copy(dialogState = ImportLoginsState.DialogState.Syncing) } composeTestRule - .onNodeWithText(text = "Syncing logins...") + .onNodeWithText(text = "Syncing logins…") .assertIsDisplayed() .assert(hasAnyAncestor(isDialog())) } diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt index e216b582a0..7c05219df5 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt @@ -431,7 +431,7 @@ class VaultItemScreenTest : BitwardenComposeTest() { // Verify only the first collection name is shown composeTestRule - .onNodeWithText("My collection...") + .onNodeWithText("My collection…") .assertIsDisplayed() // Verify other collection names are not shown by default. diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt index 4a31d2a7a7..65a6ca728b 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt @@ -794,7 +794,7 @@ class VaultScreenTest : BitwardenComposeTest() { } composeTestRule - .onNodeWithText("Syncing...") + .onNodeWithText("Syncing…") .assertIsDisplayed() .assert(hasAnyAncestor(isDialog())) } diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index bed94b9fe7..5a341a5028 100644 --- a/ui/src/main/res/values/strings.xml +++ b/ui/src/main/res/values/strings.xml @@ -12,7 +12,7 @@ Copy password Copy username Delete - Deleting... + Deleting… Do you really want to delete? This cannot be undone. Edit Edit folder @@ -55,7 +55,7 @@ Password Save Move - Saving... + Saving… Settings Show Item deleted @@ -104,7 +104,7 @@ 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. - Logging in... + Logging in… Log in to Bitwarden Password confirmation is not correct. The master password is the password you use to access your vault. It is very important that you do not forget your master password. There is no way to recover the password in the event that you forget it. @@ -146,8 +146,8 @@ Select Item details Item saved - Submitting... - Syncing... + Submitting… + Syncing… Syncing complete Two-step login Unlock with Biometrics @@ -166,7 +166,7 @@ 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. - Autofill + Autofill Do you want to autofill or view this item? Search Learn about organizations @@ -185,7 +185,7 @@ Add new attachment Attachments Unable to download file. - Downloading... + Downloading… This attachment is %1$s in size. Are you sure you want to download it onto your device? Authenticator key Verification code (TOTP) @@ -399,10 +399,10 @@ Scanning will happen automatically. Attachment saved successfully Please turn on \"Autofill Accessibility Service\" from Bitwarden Settings to use the Autofill tile. No password fields detected - Sending to trash... + Sending to trash… Item has been sent to trash. Restore - Restoring... + Restoring… Item restored Trash Do you really want to permanently delete? This cannot be undone. @@ -811,7 +811,7 @@ Do you want to switch to this account? Need help? Check out import help. Save the exported file somewhere on your computer you can find easily. This is not a recognized Bitwarden server. You may need to check with your provider or update your server. - Syncing logins... + Syncing logins… Download the browser extension Go to bitwarden.com/download to integrate Bitwarden into your favorite browser for a seamless experience. Use the web app @@ -920,7 +920,7 @@ Do you want to switch to this account? No folder Show less Add field - %s... + %s… Share error details Flight recorder Flight recorder help