Merge pull request #940 from radixdlt/l10n_crowdin_main

New Crowdin updates

app/src/main/java/com/babylon/wallet/android/presentation/settings/securitycenter/SecurityCenterScreen.kt

@@ -117,7 +117,7 @@ private fun SecurityCenterContent(
  onBackupEntities()
  },
  title = title,
- subtitle = stringResource(id = R.string.securityCenter_problem3_text)
+ subtitle = stringResource(id = R.string.securityProblems_no3_securityCenterBody)
  )
  }
 
@@ -137,7 +137,7 @@ private fun SecurityCenterContent(
  .clip(RadixTheme.shapes.roundedRectMedium)
  .clickable { onBackupConfigurationClick() },
  title = title,
- subtitle = stringResource(id = R.string.securityCenter_problem6_text)
+ subtitle = stringResource(id = R.string.securityProblems_no6_securityCenterBody)
  )
  }
  }
@@ -352,14 +352,26 @@ private fun BackupConfigurationCard(needsAction: Boolean, onBackupConfigurationC
 @Composable
 fun SecurityProblem.toProblemHeading(): String {
  return when (this) {
- is SecurityProblem.EntitiesNotRecoverable -> stringResource(
- id = R.string.securityCenter_problem3_heading,
- accountsNeedBackup,
- personasNeedBackup
- )
+ is SecurityProblem.EntitiesNotRecoverable -> {
+ val accountsString = if (accountsNeedBackup == 1) {
+ stringResource(id = R.string.securityProblems_common_accountSingular)
+ } else {
+ stringResource(id = R.string.securityProblems_common_accountPlural, accountsNeedBackup)
+ }
+ val personasString = if (personasNeedBackup == 1) {
+ stringResource(id = R.string.securityProblems_common_personaSingular)
+ } else {
+ stringResource(id = R.string.securityProblems_common_personaPlural, personasNeedBackup)
+ }
+ stringResource(
+ id = R.string.securityProblems_no3_securityCenterTitle,
+ accountsString,
+ personasString
+ )
+ }
 
- is SecurityProblem.SeedPhraseNeedRecovery -> stringResource(id = R.string.securityCenter_problem9_heading)
- SecurityProblem.BackupNotWorking -> stringResource(id = R.string.securityCenter_problem6_heading)
+ is SecurityProblem.SeedPhraseNeedRecovery -> stringResource(id = R.string.securityProblems_no9_securityCenterTitle)
+ SecurityProblem.BackupNotWorking -> stringResource(id = R.string.securityProblems_no6_securityCenterTitle)
  }
 }
 

app/src/main/java/com/babylon/wallet/android/presentation/settings/securitycenter/backup/BackupScreen.kt

@@ -448,7 +448,7 @@ private fun BackupWarning(modifier: Modifier = Modifier) {
  tint = RadixTheme.colors.orange3
  )
  Text(
- text = stringResource(id = R.string.configurationBackup_problem5WarningAndroid),
+ text = stringResource(id = R.string.securityProblems_no5_configurationBackup),
  style = RadixTheme.typography.body1HighImportance,
  color = RadixTheme.colors.orange3
  )

app/src/main/res/values-en/strings.xml

@@ -1038,22 +1038,6 @@
  <string name="securityCenter_title">Security Center</string>
  <string name="securityCenter_subtitle">Decentralized security settings that give you total control over your wallet’s protection.</string>
  <string name="securityCenter_goodState_heading">Your wallet is recoverable</string>
- <string name="securityCenter_problem3_heading">%d Account(s) and %d Persona(s) are/is not recoverable</string>
- <string name="securityCenter_problem3_text">View and write down your seed phrase so Accounts and Personas are recoverable</string>
- <string name="securityCenter_problem3_warning">Please write down your seed phrase</string>
- <string name="securityCenter_problem5_heading">Your wallet is not recoverable</string>
- <string name="securityCenter_problem5_text">Automated Configuration Backup has stopped working. Check internet and cloud settings.</string>
- <string name="securityCenter_problem5_warningIOS">Automated Configuration Backup not working. Check internet connection and iCloud settings.</string>
- <string name="securityCenter_problem5_warningAndroid">Automated Configuration Backup not working. Check internet connection and Google Drive settings.</string>
- <string name="securityCenter_problem6_heading">Your wallet is not recoverable</string>
- <string name="securityCenter_problem6_text">Configuration Backup is not up to date. Create backup now.</string>
- <string name="securityCenter_problem6_warning">To secure your wallet, turn on automated backups or manually export backup file.</string>
- <string name="securityCenter_problem7_heading">Your wallet is not recoverable</string>
- <string name="securityCenter_problem7_text">Accounts and Personas not recoverable. Create Configuration Backup now.</string>
- <string name="securityCenter_problem7_warning">Configuration Backup not up to date. Turn on automated backups or manually export backup file.</string>
- <string name="securityCenter_problem9_heading">Recovery required</string>
- <string name="securityCenter_problem9_text">Enter seed phrase to begin recovery.</string>
- <string name="securityCenter_problem9_warning">Enter your seed phrase to recover Accounts</string>
  <string name="securityCenter_securityFactorsItem_title">Security Factors</string>
  <string name="securityCenter_securityFactorsItem_subtitle">The keys you use to control your Accounts and Personas</string>
  <string name="securityCenter_securityFactorsItem_activeStatus">Active</string>
@@ -1080,10 +1064,6 @@
  <string name="securityFactors_ledgerWallet_counterPlural">%d set</string>
  <string name="configurationBackup_title">Configuration Backup</string>
  <string name="configurationBackup_heading">You need an up-to-date Configuration Backup to recover your Accounts and Personas if you lose access to them.\n\nYour Backup does not contain your keys or seed phrase.</string>
- <string name="configurationBackup_problem5WarningIOS">Automated Configuration Backup not working. Check internet connection and iCloud settings.</string>
- <string name="configurationBackup_problem5WarningAndroid">Automated Configuration Backup not working. Check internet connection and Google Drive settings.</string>
- <string name="configurationBackup_problem6Warning">To secure your wallet, turn on automated backups or manually export backup file.</string>
- <string name="configurationBackup_problem7Warning">Configuration Backup not up to date. Turn on automated backups or manually export backup file.</string>
  <string name="configurationBackup_automated_text">Configuration Backup status</string>
  <string name="configurationBackup_automated_warning">Without an updated Configuration Backup, you cannot recover your Accounts and Personas.</string>
  <string name="configurationBackup_automated_toggleIOS">Automated iCloud Backups</string>
@@ -1182,7 +1162,7 @@
  <string name="factoryReset_dialog_title">Confirm factory reset</string>
  <string name="factoryReset_dialog_message">Return wallet to factory settings? You cannot undo this.</string>
  <string name="securityProblems_no3_accountCard">You need to write down a seed phrase</string>
- <string name="securityProblems_no3_securityCenterTitle">View and write down your seed phrase so Accounts and Personas are recoverable</string>
+ <string name="securityProblems_no3_securityCenterTitle">%s and %s are not recoverable.</string>
  <string name="securityProblems_no3_securityCenterBody">View and write down your seed phrase so Accounts and Personas are recoverable.</string>
  <string name="securityProblems_no3_securityFactors">View and write down seed phrase</string>
  <string name="securityProblems_no3_seedPhrases">View and write down seed phrase</string>
@@ -1213,4 +1193,8 @@
  <string name="securityProblems_no9_seedPhrases">Enter seed phrase to recover control</string>
  <string name="securityProblems_no9_walletSettingsPersonas">Recovery required</string>
  <string name="securityProblems_no9_personas">Recovery required</string>
+ <string name="securityProblems_common_accountSingular">1 account</string>
+ <string name="securityProblems_common_accountPlural">%d accounts</string>
+ <string name="securityProblems_common_personaSingular">1 persona</string>
+ <string name="securityProblems_common_personaPlural">%d personas</string>
 </resources>