Merge branch social-backup-poc

This commit is contained in:
ameba23
2021-05-31 13:43:43 +02:00
8 changed files with 57 additions and 30 deletions

View File

@@ -723,12 +723,13 @@
<string name="activity_name_restore_account">Restore Account</string>
<!-- conversation -->
<string name="social_backup_shard_received">You have received a social backup shard.</string>
<string name="social_backup_shard_sent">You have sent a social backup shard.</string>
<string name="social_backup_shard_received">%1$s has sent you a social backup shard.</string>
<string name="social_backup_shard_sent">You have sent a social backup shard to %1$s.</string>
<string name="activity_name_new_or_recover_account">Create new account or recover existing account</string>
<string name="activity_name_recovery">Recover Account</string>
<string name="activity_name_custodian_help_recovery">Help recover account</string>
<string name="existing_backup_explain">%d of the following contacts are needed to restore your account:</string>
<!-- Remote Wipe -->