diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/keyBackup/AccountBackupScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/keyBackup/AccountBackupScreen.kt index 763670e9df..35791070c2 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/keyBackup/AccountBackupScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/keyBackup/AccountBackupScreen.kt @@ -135,6 +135,7 @@ import com.vitorpamplona.amethyst.commons.ui.loadStringRes import com.vitorpamplona.amethyst.commons.ui.navigation.navs.EmptyNav import com.vitorpamplona.amethyst.commons.ui.navigation.navs.INav import com.vitorpamplona.amethyst.commons.ui.navigation.topbars.TopBarWithBackButton +import com.vitorpamplona.amethyst.commons.ui.pluralStringRes import com.vitorpamplona.amethyst.commons.ui.stringRes import com.vitorpamplona.amethyst.commons.ui.theme.ThemeComparisonRow import com.vitorpamplona.amethyst.ui.note.authenticate @@ -498,7 +499,7 @@ private fun EncryptedKeyCard( label = { Text(stringRes(Res.string.account_backup_encrypted_password)) }, supportingText = { Text( - text = stringRes(Res.string.account_backup_password_min_length, Nip49.MIN_PASSWORD_LENGTH), + text = pluralStringRes(Res.plurals.account_backup_password_min_length, Nip49.MIN_PASSWORD_LENGTH, Nip49.MIN_PASSWORD_LENGTH), color = if (longEnough) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant, ) }, diff --git a/commonsUI/src/commonMain/composeResources/values-cs/strings.xml b/commonsUI/src/commonMain/composeResources/values-cs/strings.xml index f97f30c142..2ffa22e2bb 100644 --- a/commonsUI/src/commonMain/composeResources/values-cs/strings.xml +++ b/commonsUI/src/commonMain/composeResources/values-cs/strings.xml @@ -6419,4 +6419,10 @@ Přehrát hlasovou zprávu Nahrát hlasovou zprávu Zastavit a odeslat + + Alespoň %1$d znak + Alespoň %1$d znaky + Alespoň %1$d znaku + Alespoň %1$d znaků + diff --git a/commonsUI/src/commonMain/composeResources/values-de-rDE/strings.xml b/commonsUI/src/commonMain/composeResources/values-de-rDE/strings.xml index a6b7b9fd49..4aa4baa6dd 100644 --- a/commonsUI/src/commonMain/composeResources/values-de-rDE/strings.xml +++ b/commonsUI/src/commonMain/composeResources/values-de-rDE/strings.xml @@ -6087,4 +6087,8 @@ Sprachnachricht abspielen Sprachnachricht aufnehmen Stoppen und senden + + Mindestens %1$d Zeichen + Mindestens %1$d Zeichen + diff --git a/commonsUI/src/commonMain/composeResources/values-hi-rIN/strings.xml b/commonsUI/src/commonMain/composeResources/values-hi-rIN/strings.xml index 0b0ad88b79..a18f22e6bf 100644 --- a/commonsUI/src/commonMain/composeResources/values-hi-rIN/strings.xml +++ b/commonsUI/src/commonMain/composeResources/values-hi-rIN/strings.xml @@ -661,7 +661,10 @@ पारणशब्द रक्षित अनुकृति पारणशब्द एक ncryptsec1… जो केवल आपके पारणशब्द से कार्य करता है। - न्यूनतम %1$d अक्षर + + न्यूनतम %1$d अक्षर + न्यूनतम %1$d अक्षर + पारणशब्द दोहराएँ पारणशब्दों में मेल नहीं रहस्यीकरण कुंचिका diff --git a/commonsUI/src/commonMain/composeResources/values-hu-rHU/strings.xml b/commonsUI/src/commonMain/composeResources/values-hu-rHU/strings.xml index a4364f5e15..3d7081f80a 100644 --- a/commonsUI/src/commonMain/composeResources/values-hu-rHU/strings.xml +++ b/commonsUI/src/commonMain/composeResources/values-hu-rHU/strings.xml @@ -661,7 +661,10 @@ Jelszóval védett másolat Jelszó Egy ncryptsec1…, amely csak az Ön jelszavával működik. - Legalább %1$d karakter + + Legalább %1$d karakter + Legalább %1$d karakter + Jelszó ismét A jelszavak nem egyeznek Kulcs titkosítása diff --git a/commonsUI/src/commonMain/composeResources/values-pl-rPL/strings.xml b/commonsUI/src/commonMain/composeResources/values-pl-rPL/strings.xml index dc64847c1e..2a9bf95377 100644 --- a/commonsUI/src/commonMain/composeResources/values-pl-rPL/strings.xml +++ b/commonsUI/src/commonMain/composeResources/values-pl-rPL/strings.xml @@ -677,7 +677,12 @@ Kopia chroniona hasłem Hasło Ncryptsec1… który działa tylko z twoim hasłem. - Co najmniej %1$d znaków + + Co najmniej %1$d znak + Co najmniej %1$d znaki + Co najmniej %1$d znaków + Co najmniej %1$d znaku + Powtórz hasło Hasła nie są identyczne Zaszyfruj klucz diff --git a/commonsUI/src/commonMain/composeResources/values-pt-rBR/strings.xml b/commonsUI/src/commonMain/composeResources/values-pt-rBR/strings.xml index d71a888f5b..af0359875a 100644 --- a/commonsUI/src/commonMain/composeResources/values-pt-rBR/strings.xml +++ b/commonsUI/src/commonMain/composeResources/values-pt-rBR/strings.xml @@ -6085,4 +6085,8 @@ Reproduzir mensagem de voz Gravar uma mensagem de voz Parar e enviar + + Pelo menos %1$d caractere + Pelo menos %1$d caracteres + diff --git a/commonsUI/src/commonMain/composeResources/values-sv-rSE/strings.xml b/commonsUI/src/commonMain/composeResources/values-sv-rSE/strings.xml index 4a2cf970c1..b57c53108e 100644 --- a/commonsUI/src/commonMain/composeResources/values-sv-rSE/strings.xml +++ b/commonsUI/src/commonMain/composeResources/values-sv-rSE/strings.xml @@ -6085,4 +6085,8 @@ Spela upp röstmeddelande Spela in ett röstmeddelande Stoppa och skicka + + Minst %1$d tecken + Minst %1$d tecken + diff --git a/commonsUI/src/commonMain/composeResources/values/strings.xml b/commonsUI/src/commonMain/composeResources/values/strings.xml index 868ac7ec31..8bd04c1ebc 100644 --- a/commonsUI/src/commonMain/composeResources/values/strings.xml +++ b/commonsUI/src/commonMain/composeResources/values/strings.xml @@ -675,7 +675,10 @@ Password-protected copy Password An ncryptsec1… that only works with your password. - At least %1$d characters + + At least %1$d character + At least %1$d characters + Repeat password Passwords don't match Encrypt key diff --git a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/auth/NewKeyOnboardingScreen.kt b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/auth/NewKeyOnboardingScreen.kt index 5475ced1ee..378a74f069 100644 --- a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/auth/NewKeyOnboardingScreen.kt +++ b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/auth/NewKeyOnboardingScreen.kt @@ -99,6 +99,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import org.jetbrains.compose.resources.pluralStringResource import org.jetbrains.compose.resources.stringResource private const val TOTAL_STEPS = 3 @@ -414,7 +415,7 @@ private fun EncryptedCopySection(nsec: String) { if (error) { Text(stringResource(Res.string.backup_keys_encrypt_failed)) } else { - Text(stringResource(Res.string.account_backup_password_min_length, Nip49.MIN_PASSWORD_LENGTH)) + Text(pluralStringResource(Res.plurals.account_backup_password_min_length, Nip49.MIN_PASSWORD_LENGTH, Nip49.MIN_PASSWORD_LENGTH)) } }, visualTransformation = diff --git a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/keyBackup/BackupKeysCard.kt b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/keyBackup/BackupKeysCard.kt index a81b62423f..2cff6a8359 100644 --- a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/keyBackup/BackupKeysCard.kt +++ b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/keyBackup/BackupKeysCard.kt @@ -96,6 +96,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import org.jetbrains.compose.resources.pluralStringResource import org.jetbrains.compose.resources.stringResource /** @@ -378,7 +379,7 @@ private fun EncryptedCopy(nsec: String) { if (error) { Text(stringResource(Res.string.backup_keys_encrypt_failed)) } else { - Text(stringResource(Res.string.account_backup_password_min_length, Nip49.MIN_PASSWORD_LENGTH)) + Text(pluralStringResource(Res.plurals.account_backup_password_min_length, Nip49.MIN_PASSWORD_LENGTH, Nip49.MIN_PASSWORD_LENGTH)) } }, visualTransformation =