From 9ced8647a31c05766a8406b60f14c2446bfaaad3 Mon Sep 17 00:00:00 2001 From: David Perez Date: Wed, 8 Oct 2025 15:09:47 -0500 Subject: [PATCH] Update Crowdin plurals (#5991) --- .../accountsetup/SetupBrowserAutofillScreen.kt | 11 ++++++----- .../feature/settings/autofill/AutoFillScreen.kt | 13 ++++++------- ui/src/main/res/values/strings.xml | 12 ++++-------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupBrowserAutofillScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupBrowserAutofillScreen.kt index 12ffd905dc..6b47f0c9fb 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupBrowserAutofillScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupBrowserAutofillScreen.kt @@ -18,7 +18,6 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll -import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview @@ -39,7 +38,6 @@ import com.bitwarden.ui.platform.components.util.rememberVectorPainter import com.bitwarden.ui.platform.composition.LocalIntentManager import com.bitwarden.ui.platform.manager.IntentManager import com.bitwarden.ui.platform.resource.BitwardenDrawable -import com.bitwarden.ui.platform.resource.BitwardenPlurals import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.platform.theme.BitwardenTheme import com.x8bit.bitwarden.data.autofill.model.browser.BrowserPackage @@ -158,9 +156,12 @@ private fun SetupBrowserAutofillContent( ) Spacer(Modifier.height(height = 8.dp)) Text( - text = pluralStringResource( - id = BitwardenPlurals.youre_using_a_browser_that_requires_special_permissions, - count = state.browserCount, + text = stringResource( + id = if (state.browserCount > 1) { + BitwardenString.youre_using_a_browser_that_requires_special_permissions_plural + } else { + BitwardenString.youre_using_a_browser_that_requires_special_permissions_singular + }, ), style = BitwardenTheme.typography.bodyMedium, color = BitwardenTheme.colorScheme.text.primary, 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 0ce2ffef5b..6a53111356 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 @@ -29,7 +29,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalResources import androidx.compose.ui.platform.testTag -import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.net.toUri @@ -61,7 +60,6 @@ import com.bitwarden.ui.platform.components.util.rememberVectorPainter import com.bitwarden.ui.platform.composition.LocalIntentManager import com.bitwarden.ui.platform.manager.IntentManager import com.bitwarden.ui.platform.resource.BitwardenDrawable -import com.bitwarden.ui.platform.resource.BitwardenPlurals import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.platform.theme.BitwardenTheme import com.x8bit.bitwarden.data.platform.repository.model.UriMatchType @@ -369,15 +367,16 @@ private fun AutofillCallToActionCard( } CtaState.BROWSER_AUTOFILL -> { + val subTitleRes = if (state.browserCount > 1) { + BitwardenString.browser_requires_special_permissions_for_bitwarden_plural + } else { + BitwardenString.browser_requires_special_permissions_for_bitwarden_singular + } BitwardenActionCard( cardTitle = stringResource( id = BitwardenString.turn_on_browser_autofill_integration, ), - cardSubtitle = pluralStringResource( - id = BitwardenPlurals - .youre_using_a_browser_that_requires_special_permissions_for_bitwarden, - count = state.browserCount, - ), + cardSubtitle = stringResource(id = subTitleRes), actionText = stringResource(id = BitwardenString.get_started), onActionClick = autoFillHandlers.onBrowserAutofillActionCardClick, onDismissClick = autoFillHandlers.onBrowserAutofillActionCardDismissClick, diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index 2e730db6c2..ce5c8f36b6 100644 --- a/ui/src/main/res/values/strings.xml +++ b/ui/src/main/res/values/strings.xml @@ -758,14 +758,10 @@ Do you want to switch to this account? Turn on autofill Autofill setup Turn on browser autofill integration - - You’re using a browser that requires special permissions for Bitwarden to autofill your passwords. - You’re using browsers that requires special permissions for Bitwarden to autofill your passwords. - - - You’re using a browser that requires special permissions for Bitwarden to autofill your passwords. Enable your preferred autofill integration below. - You’re using browsers that requires special permissions for Bitwarden to autofill your passwords. Enable autofill for all your installed browsers to continue. - + You’re using a browser that requires special permissions for Bitwarden to autofill your passwords. + You’re using browsers that requires special permissions for Bitwarden to autofill your passwords. + You’re using a browser that requires special permissions for Bitwarden to autofill your passwords. Enable your preferred autofill integration below. + You’re using browsers that requires special permissions for Bitwarden to autofill your passwords. Enable autofill for all your installed browsers to continue. Use autofill to log into your accounts with a single tap. Turn on later Turn on autofill later?